Back
[00:04:31] -!-
theorbtwo has quit [Ping timeout: 260 seconds]
[00:04:45] theorb is now known as
theorbtwo
[00:08:31] -!-
PCW has quit [Quit: ChatZilla 0.9.87 [Firefox 3.6.13/20101203075014]]
[00:32:02] -!-
Tom_itx has quit [Ping timeout: 252 seconds]
[00:36:19] -!-
Technicus has quit [Quit: Leaving.]
[00:54:48] -!-
skunkworks_ has quit [Remote host closed the connection]
[01:00:26] -!-
jbunch has quit [Ping timeout: 258 seconds]
[01:18:34] -!-
jbunch has quit [Read error: Connection reset by peer]
[01:37:02] -!-
WalterN has quit [Quit: Leaving]
[01:47:25] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[01:53:41] -!-
sumpfralle1 has quit [Ping timeout: 240 seconds]
[02:13:47] -!-
sumpfralle has quit [Ping timeout: 258 seconds]
[02:15:51] -!-
Sairon has quit [Quit: Lost terminal]
[02:16:11] -!-
jbunch has quit [Read error: Connection reset by peer]
[02:23:09] -!-
Loetmichel has quit [Ping timeout: 276 seconds]
[02:24:27] -!-
Tom_itx has quit [Ping timeout: 276 seconds]
[02:24:34] Tom_afk is now known as
Tom_itx
[02:26:07] kljsdfhklj is now known as
kljzzzzz
[02:45:00] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[03:03:11] -!-
andypugh has quit [Quit: andypugh]
[03:13:48] -!-
jbunch has quit [Read error: Connection reset by peer]
[03:32:48] -!-
pcw_home has quit [Ping timeout: 252 seconds]
[03:33:02] pcw_home_ is now known as
pcw_home
[03:42:37] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[03:44:56] -!-
elmo40 has quit [Quit: Leaving.]
[03:58:33] Tech_Talk is now known as
Birdman3131
[04:02:34] -!-
Calyp has quit [Remote host closed the connection]
[04:05:49] -!-
ries has quit [Quit: ries]
[04:11:26] -!-
jbunch has quit [Read error: Connection reset by peer]
[04:23:20] -!-
FinboySlick has quit [Quit: Leaving.]
[04:40:14] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[04:45:21] -!-
hatch789 has quit [Quit: Leaving]
[04:55:02] -!-
ve7it has quit [Remote host closed the connection]
[04:56:24] -!-
Birdman3131 has quit [Ping timeout: 250 seconds]
[05:09:03] -!-
jbunch has quit [Read error: Connection reset by peer]
[05:19:57] -!-
TekniQue has quit [Ping timeout: 276 seconds]
[05:24:34] -!-
mikeggg has quit [Ping timeout: 250 seconds]
[05:27:17] -!-
automata [automata!~automata@122.170.72.59] has joined #emc-devel
[05:38:00] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[06:07:09] -!-
jbunch has quit [Read error: Connection reset by peer]
[06:35:47] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[07:01:04] -!-
mhaberler [mhaberler!~mhaberler@46.207.255.32] has joined #emc-devel
[07:02:18] <mhaberler> cradek: thanks - will take extra care from now on
[07:08:03] -!-
jbunch has quit [Ping timeout: 258 seconds]
[07:17:04] -!-
Eartaker has quit [Quit: Not again...]
[07:17:13] <automata> hi whom do I talk to about a patch to improve usability for shcom.cc?
[07:17:45] <automata> shcom.cc currently access the NML buffer using the process name "xemc"
[07:18:05] <automata> If that name were configurable, shcom.cc would find more usability.
[07:18:32] <automata> ofcourse we can maintain backwards compatibility using default arguments to various functions
[07:33:13] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[07:41:47] -!-
capricorn_one has quit [Remote host closed the connection]
[07:41:48] -!-
mhaberler has quit [Read error: Connection reset by peer]
[07:47:25] -!-
mhaberler [mhaberler!~mhaberler@46.207.255.32] has joined #emc-devel
[07:48:01] -!-
mhaberler has quit [Client Quit]
[08:02:04] -!-
jbunch has quit [Read error: Connection reset by peer]
[08:30:52] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[08:59:41] -!-
jbunch has quit [Read error: Connection reset by peer]
[09:28:29] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[09:57:18] -!-
jbunch has quit [Read error: Connection reset by peer]
[10:01:22] -!-
TekniQue has quit [Changing host]
[10:12:32] -!-
jogger has quit [Client Quit]
[10:26:06] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[10:28:31] -!-
kljzzzzz has quit [Quit: kljzzzzz]
[10:54:56] -!-
jbunch has quit [Read error: Connection reset by peer]
[11:17:48] -!-
n2diy has quit [Quit: Ex-Chat]
[11:24:30] -!-
maximilian_h [maximilian_h!~bonsai@p549FD439.dip.t-dialin.net] has joined #emc-devel
[11:27:11] -!-
jbunch_ has quit [Ping timeout: 258 seconds]
[11:29:53] -!-
syyl has quit [Ping timeout: 250 seconds]
[11:45:21] <jthornton> I'm using Glade 3.6.7 and get this error when I try and open up stepconf.glade
[11:45:23] <jthornton> Failed to load /home/john/emc2-dev/src/emc/usr_intf/stepconf/stepconf.glade.
[11:45:25] <jthornton> The following required catalogs are unavailable: gnome
[11:45:41] <jthornton> any clues as to what I'm missing?
[11:52:32] -!-
jbunch has quit [Read error: Connection reset by peer]
[11:57:07] -!-
n2diy has quit [Remote host closed the connection]
[12:04:45] -!-
Calyp has quit [Changing host]
[12:22:04] -!-
mhaberler [mhaberler!~mhaberler@46.207.255.204] has joined #emc-devel
[12:25:04] -!-
jbunch_ has quit [Ping timeout: 258 seconds]
[12:31:17] -!-
automata has quit [Remote host closed the connection]
[12:39:30] -!-
theos has quit [Ping timeout: 252 seconds]
[12:45:06] -!-
isssy has quit [Client Quit]
[12:50:04] -!-
jbunch has quit [Read error: Connection reset by peer]
[12:52:41] -!-
ries has quit [Ping timeout: 240 seconds]
[12:52:41] ries_ is now known as
ries
[12:53:02] -!-
mhaberler has quit [Quit: mhaberler]
[13:05:18] -!-
nicko has quit [Ping timeout: 255 seconds]
[13:08:30] -!-
factor has quit [Ping timeout: 240 seconds]
[13:11:25] -!-
robh__ [robh__!~robert@5ace7076.bb.sky.com] has joined #emc-devel
[13:18:58] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[13:29:44] -!-
psha [psha!~psha@213.208.162.69] has joined #emc-devel
[13:39:55] -!-
n2diy has quit [Remote host closed the connection]
[13:47:44] -!-
jbunch has quit [Read error: Connection reset by peer]
[14:04:43] -!-
tom3p [tom3p!~tomp@74-93-88-241-Illinois.hfc.comcastbusiness.net] has joined #emc-devel
[14:07:37] -!-
ries has quit [Quit: ries]
[14:16:32] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[14:17:59] -!-
Valen has quit [Quit: Leaving.]
[14:45:20] -!-
jbunch has quit [Read error: Connection reset by peer]
[14:56:52] -!-
jbunch_ has quit [Ping timeout: 258 seconds]
[14:59:42] -!-
tris has quit [Excess Flood]
[15:21:55] -!-
mhaberler [mhaberler!~mhaberler@46.207.255.32] has joined #emc-devel
[15:27:32] <psha> mhaberler: good evening
[15:28:00] <mhaberler> hi psha!
[15:28:07] <mhaberler> back from expedition?
[15:30:14] -!-
jbunch has quit [Read error: Connection reset by peer]
[15:34:26] <psha> yea
[15:34:47] <psha> 5k km on wheels :)
[15:35:02] <psha> with not easy repair in the middle
[15:35:22] <mhaberler> uh,oh
[15:38:30] <psha> l200 lost left front axle hub
[15:38:39] -!-
jbunch has quit [Ping timeout: 258 seconds]
[15:39:07] <psha> so we were waiting for two days while new part was traveling from Moscow to Murmansk and then 7 hours to replace it :)
[15:39:37] -!-
awallin has quit [Read error: Operation timed out]
[15:39:40] -!-
jbunch__ has quit [Read error: No route to host]
[15:40:57] -!-
jbunch_ has quit [Ping timeout: 258 seconds]
[15:42:37] -!-
jbunch has quit [Read error: No route to host]
[15:44:48] -!-
awallin [awallin!~quassel@cs27057046.pp.htv.fi] has joined #emc-devel
[15:50:19] -!-
mikegg has quit [Ping timeout: 250 seconds]
[15:53:12] <mhaberler> psha: what do you think about the matplot halscope widget idea?
[15:53:17] -!-
tom3p has quit [Quit: Ex-Chat]
[15:53:40] <psha> matplot?
[15:53:53] <psha> ah, python matplotlib
[15:53:56] <mhaberler> I sent you mail about it
[15:54:06] <mhaberler> yep, has neat timeseries stripchart support
[15:54:11] <psha> i think halsampler python module will serve 90% of demands :)
[15:54:13] <psha> first :)
[15:59:46] <mhaberler> that sounds like a good datasource for the stripchart example I sent you
[16:02:10] <psha> mhaberler: re patch as main ui - ack
[16:02:15] <psha> looks fine
[16:02:59] <psha> however instead of pos= index maybe first check as '-ini' in sys.argv?
[16:03:31] <psha> i mean "if '-ini' in sys.argv:"
[16:03:35] <psha> then ....
[16:04:37] -!-
mikegg has quit [Read error: Connection reset by peer]
[16:06:19] <mhaberler> that's unpythonic, we're asking for forgiveness, not permission ;-)
[16:10:34] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[16:26:41] -!-
gene76 has quit [Read error: Operation timed out]
[16:36:36] -!-
Spida has quit [Ping timeout: 276 seconds]
[16:39:23] -!-
jbunch has quit [Read error: Connection reset by peer]
[16:41:30] -!-
mhaberler has quit [Quit: mhaberler]
[16:50:54] -!-
mhaberler [mhaberler!~mhaberler@46.207.255.32] has joined #emc-devel
[16:51:39] -!-
ve7it [ve7it!~LawrenceG@S0106009027972e37.pk.shawcable.net] has joined #emc-devel
[16:52:42] -!-
mhaberler has quit [Client Quit]
[16:54:21] -!-
jepler has quit [Ping timeout: 252 seconds]
[16:59:55] -!-
theos has quit [Remote host closed the connection]
[17:05:04] -!-
izua_ has quit [Quit: Lost terminal]
[17:05:24] -!-
izua has quit [Changing host]
[17:05:24] -!-
jbunch_ has quit [Remote host closed the connection]
[17:06:43] -!-
jepler [jepler!~jepler@emc/developer/pdpc.professional.jepler] has joined #emc-devel
[17:18:43] -!-
pcw_home has quit [Ping timeout: 240 seconds]
[17:18:52] pcw_home_ is now known as
pcw_home
[17:21:38] -!-
El_Matarife has quit [Quit: Nettalk6 - www.ntalk.de]
[17:28:49] -!-
jepler has quit [Ping timeout: 252 seconds]
[17:29:28] -!-
jepler [jepler!~jepler@emc/developer/pdpc.professional.jepler] has joined #emc-devel
[17:32:48] -!-
jepler has quit [Read error: Connection reset by peer]
[17:33:08] -!-
jepler [jepler!~jepler@emc/developer/pdpc.professional.jepler] has joined #emc-devel
[18:15:48] -!-
isssy has quit [Quit: Visitor from www.linuxcnc.org]
[18:56:23] -!-
e-ndy [e-ndy!~jkastner@static-84-242-102-36.net.upcbroadband.cz] has joined #emc-devel
[19:31:41] -!-
maximilian_h [maximilian_h!~bonsai@p549FD439.dip.t-dialin.net] has parted #emc-devel
[19:46:29] -!-
JT-Shop has quit [Ping timeout: 250 seconds]
[19:52:11] -!-
JT-Shop [JT-Shop!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[19:56:24] -!-
jbunch has quit [Read error: Connection reset by peer]
[19:58:40] -!-
JT-Hardinge [JT-Hardinge!~chatzilla@216-41-156-49.semo.net] has joined #emc-devel
[19:58:49] -!-
JT-Hardinge has quit [Client Quit]
[20:09:56] -!-
Guest531 has quit [Quit: Visitor from www.linuxcnc.org]
[20:25:20] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[20:26:01] -!-
andypugh [andypugh!~andy2@cpc2-basl1-0-0-cust1037.basl.cable.virginmedia.com] has joined #emc-devel
[20:33:53] <chester88> Jthornton: glade-gnome but if you are trying to do changes to stepconf with 3.6.7 don't bother. You must use glade from 8.04
[20:36:42] <chester88> which is glade 3.4.5
[20:41:08] <JT-Shop> chester88: thanks
[20:41:39] <chester88> JT-Sop
[20:41:46] <JT-Shop> I was trying to see if I could fix the Machine configuration page
[20:42:00] <chester88> Whats wrong with it?
[20:42:02] <JT-Shop> it's too tall to fit on 800x600
[20:42:17] <chester88> ok
[20:42:22] <JT-Shop> even if you hide the menu and the status bar is moved to the right or left
[20:43:25] <chester88> I'll look into it....
[20:43:45] <JT-Shop> thanks
[20:47:01] <chester88> JT-Shop: you mean the 'Basic machine information" page?
[20:52:07] <JT-Shop> one second I'll verify
[20:52:47] <JT-Shop> yes
[20:53:00] <JT-Shop> it's the only page that is that tall
[20:54:08] -!-
jbunch has quit [Read error: Connection reset by peer]
[20:54:13] <andypugh> I want to patch a problem in 2.5. However, one file that the patch needs to change is only in master.
[20:54:56] <andypugh> Is the solution to do it as two separate patches? One applied to 2.5 and one to Master? Or will that cause problems with the next upstream merge?
[20:55:57] -!-
maximilian_h [maximilian_h!~bonsai@g228021160.adsl.alicedsl.de] has joined #emc-devel
[20:56:07] -!-
maximilian_h has quit [Client Quit]
[21:00:41] <chester88> JT-Shop: if you collapse the 'driver timing settings' and 'parallel port settings' it is useable right?
[21:01:55] <chester88> JT-Shop: that was the way it was decided to go (force the user to collapse them) right or wrong. Opinions?
[21:04:04] <JT-Shop> one minute I'll look
[21:04:18] -!-
El_Matarife has quit [Quit: Nettalk6 - www.ntalk.de]
[21:04:59] <JT-Shop> I see it now but for the life of me I didn't notice it
[21:05:28] <JT-Shop> and didn't see any visual clue that that area might be collapsible
[21:05:31] -!-
psha has quit [Quit: Lost terminal]
[21:05:54] <JT-Shop> can you start with them collapsed?
[21:06:39] -!-
mhaberler [mhaberler!~mhaberler@46.207.255.32] has joined #emc-devel
[21:09:34] <chester88> JT-Shop I could - it's actually easier but it was thought maybe users might not find the collapsed options. Maybe that is wrong.
[21:13:12] <JT-Shop> sounds like a catch 22
[21:16:06] <JT-Shop> seems like where it says you need 800x600 a note about collapsing items on the basic machine information page would be intuitive enough and leave them not collapsed for the other 99% of users
[21:16:27] <chester88> I haven't heard of complaints of not being able to use stepconf with 800x600 so maybe most people figure it out?
[21:17:24] <JT-Shop> I spend an hour with a guy this morning and I couldn't figure it out nor could he
[21:18:49] <chester88> lol well we sure could add the info like you said or have them collapsed, it matters not to me. Maybe Jeff has an opinion.
[21:19:55] <chester88> Why does he have 800x600 display? is there a good reason for that? just curious.
[21:20:31] -!-
mhaberler has quit [Quit: mhaberler]
[21:21:01] <JT-Shop> LOL, a touch screen
[21:22:09] <chester88> oh I see. Have you used a touch screen for EMC ? do you like it?
[21:22:44] <JT-Shop> no, I don't have one but I set my display to 800x600 to play along with him trying to figure it out
[21:22:57] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[21:24:01] <chester88> yes i just did that too. But I remembered that we added collapsible ex panders :) mostly cause I did the work.
[21:25:37] <JT-Shop> that's why I think another sentence on the first page would be very helpful in these rare occasions... if I had an 8.04 machine I'd add it
[21:27:42] <chester88> k I will add the info
[21:27:48] <JT-Shop> thanks
[21:28:08] * JT-Shop back to putting plasma cutter back together
[21:38:50] -!-
factor has quit [Quit: Leaving]
[21:51:45] -!-
jbunch has quit [Read error: Connection reset by peer]
[21:54:22] -!-
syyl_ has quit [Quit: Leaving]
[21:54:39] -!-
e-ndy has quit [Quit: Ex-Chat]
[22:03:05] <jepler> apropos of nothing: running emc on lucid in kvm/libvirt with 4 CPUs configured in the guest, I typically can't do even one run of 'runtests' before the machine prints some big ugly oops on the console and hangs. With only 2 CPUs, it at least gets through one full run.
[22:04:35] * JT-Shop looked up what jepler said :)
[22:05:00] -!-
mhaberler [mhaberler!~mhaberler@46.207.255.204] has joined #emc-devel
[22:07:50] <CIA-11> EMC: 03cmorley 07v2.4_branch * rb6a835633fa3 10/src/emc/usr_intf/stepconf/stepconf.glade: stepconf - add info about using with 800x600 display
[22:08:30] <JT-Shop> YEA! I won't get fooled again
[22:10:29] <chester88> JT-Shop: not sure what branch buddy was having problems with but eventually this will move all the way to 2.5 and master
[22:11:24] <JT-Shop> he tried them all I think
[22:11:34] <JT-Shop> chester88: thanks
[22:11:45] <chester88> you bet !
[22:12:31] <chester88> I have 8.04 virtualized jus
[22:12:40] <chester88> on 10.04 so I v
[22:12:55] <chester88> I can work on pncconf.
[22:13:03] <JT-Shop> I used to have that too when the manuals required it...
[22:13:09] <chester88> wow bad fingers!
[22:13:53] <chester88> It's a pain that won't go away. glade says they won't bother fixing it.
[22:14:19] <chester88> Which seems to mean druids are going away...
[22:14:35] <JT-Shop> at least you can blame it on your fingers in my case PEBKAC or what ever it is
[22:14:59] <chester88> PEBKAC ?
[22:18:46] <JT-Shop> Problem Exist Between Keyboard And Chair
[22:20:34] -!-
jbunch_ has quit [Read error: Connection reset by peer]
[22:25:04] -!-
mhaberler has quit [Quit: mhaberler]
[22:27:52] <andypugh> Ah, jepler....
[22:28:59] -!-
Birdman3131 has quit [Ping timeout: 250 seconds]
[22:29:53] <andypugh> There is something in smart-serial that means that a bugfix intended for 2.5 but based on master won't take. As it happens, it is no longer needed in master (it is the handling of unknown smart-serial hardware, but now they are all going to self-configure from info on the card firmware). What would you suggest as a workflow?
[22:39:53] -!-
nullie has quit [Quit: Ex-Chat]
[22:49:18] -!-
mikegg has quit [Remote host closed the connection]
[22:49:18] -!-
jbunch has quit [Read error: Connection reset by peer]
[22:59:10] <jepler> if it goes in 2.5, then it has to go in 2.5. If it means that master will have a conflict, then that'll have to be resolved by hand the next time the merge is done
[23:00:39] <andypugh> I am wondering about removing the now-superflous code from master first
[23:02:57] <jepler> if you know that the second patch for master only (removing code from master) that touches the same code as a first patch for 2.5 (fixing bug), then you should make the 2.5 change, merge 2.5 to master, then make the master change.
[23:03:15] <jepler> because that may make it all happen without a merge conflict
[23:03:31] <jepler> if you put one patch on master, the other patch on 2.5, and merge, then you'll get a merge conflict if they modify the same lines in different ways
[23:04:08] <jepler> anyone can merge 2.5 to master, and if there are no merge conflicts then it's just fine to push the result. If there are merge conflicts and you're not 100% sure about resolving them, then it's best not to push the result of the merge
[23:06:30] <andypugh> I will probably do the 2.5 fix then wait for the next upstream merge.
[23:06:46] <jepler> ok. if you don't mind waiting, that sounds fine
[23:07:59] <andypugh> Deleting the other_sserial code makes most sense in the context of adding the parameter-discovery code, and that is going to be weeks away.
[23:08:24] <jepler> is anyone seeing this failure in runtests?
[23:08:24] <jepler> *** /usr/src/emc2/tests/halmodule.0: FAIL: result differed from expected
[23:09:01] <JT-Shop> how do you do the runtests?
[23:09:30] <JT-Shop> on the RIP?
[23:10:02] <jepler> runtests is a command you can run after . scripts/emc-environment
[23:10:05] <jepler> bbl, time to make dinner
[23:12:45] <JT-Shop> ok
[23:16:13] <JT-Shop> jepler: which branch are you doing the runtests on?
[23:17:36] -!-
jbunch has quit [Read error: Connection reset by peer]
[23:17:55] -!-
mozmck has quit [Ping timeout: 258 seconds]
[23:19:39] -!-
mozmck [mozmck!~moses@client-173.225.233.241.dfwtx.partnershipbroadband.com] has joined #emc-devel
[23:19:40] -!-
jbunch_ has quit [Ping timeout: 250 seconds]
[23:24:01] -!-
mozmck has quit [Ping timeout: 246 seconds]
[23:26:25] -!-
mozmck [mozmck!~moses@client-173.225.233.241.dfwtx.partnershipbroadband.com] has joined #emc-devel
[23:42:09] <andypugh> Do I have to git remote add before I can push to 2.5 rather than master? (--dry-run is currently feeling like the best idea ever)
[23:45:56] -!-
atom1 has quit [Client Quit]
[23:46:06] <jepler> there is git push --dry-run, and yes -- it is a very good idea
[23:46:20] <jepler> if you've pushed to master, then you should be equally set up to push v2.5_branch
[23:46:21] -!-
jbunch__ has quit [Read error: Connection reset by peer]
[23:46:26] <jepler> because they are on the same remote (origin)
[23:46:47] <andypugh> I haven't pushed to anywhere yet.
[23:46:58] <jepler> ok
[23:47:04] <andypugh> but the dry-run seems to want to push to master.
[23:47:23] <andypugh> I haven't yet figured out how to change its mind.
[23:48:13] <andypugh> Checking-out origin/v2.5_branch was my first guess, but that isn't it.
[23:49:28] <jepler> ok, let's start from the basics. You made and committed some changes (right?). What branch did you commit them on?
[23:50:12] <andypugh> They were branches from master.
[23:50:39] <andypugh> Those no longer exist, I now have a complete fresh clone using my ssh key.
[23:51:18] <jepler> ok.
[23:51:38] <andypugh> What I do have is a set of patch files that I hope to push to the relevant remote branches
[23:52:03] <andypugh> Where, in some cases, "relevant" is yet to be determined.
[23:52:04] <jepler> in your new clone, you need to create a v2.5_branch which is tracking origin/v2.5_branch. Have you done anything like that? need to learn how?
[23:52:52] <andypugh> I think I might have done. I did git checkout -b origin/v2.5_branch
[23:53:28] <andypugh> But when I patched that, committed, and dry-run pushed the changes were going to go to master (and they failed too)
[23:54:00] <andypugh> So I suspect that that process isn't the correct one.
[23:54:05] <jepler> yes, unfortunately, that's not what you needed to do, and git went ahead and did something you didn't expect.
[23:55:35] <andypugh> It did partly what I expected, as the file structure became 2.5 (I could tell by what was missing)
[23:56:48] <jepler> what you want to do is
[23:56:49] <jepler> $ git checkout v2.5_branch
[23:56:49] <jepler> Branch v2.5_branch set up to track remote branch v2.5_branch from origin.
[23:56:49] <jepler> Switched to a new branch 'v2.5_branch'
[23:57:49] <jepler> then I think you want to 'git branch -D origin/v2.5_branch'
[23:58:58] <jepler> (it turns out that usually origin/xxx is shorthand for remotes/origin/xxx, but when you created a local branch origin/xxx, that is no longer true .. if that doesn't really make sense, don't worry too much -- it's taken me 5 minutes to try to come up with an explanation and I still don't think that's a good one)
[23:59:07] <andypugh> I found git branch --track, but you are saying that the actual solution is to omit the "origin/" in the checkout command. That doesn't seem the most obvious distinction between the behaviours
[23:59:22] <andypugh> Anf yes, I already deleted the spurious local branch