=== r0bby is now known as robbyoconnor
[02:30] <poolie> spiv, hi?
[07:24] <mgz> morning all!
[07:39] <Merwin_> hi mgz :)
[10:08] <mgz> to get a log of the whole of a history branch given a dotted revno from within it,
[10:08] <mgz> is there anything smarter than:
[10:08] <mgz> `bzr log --forward -l1 -r191.1.5..`
[10:08] <mgz> then seeing what the revno of that is in the parent branch and doing:
[10:09] <mgz> `bzr log -n0 -c198`
[10:17] <ribe> I have checkout main project branch, but how do I create development branch on my localhost?
[10:19] <mgz> ribe: not really sure what you want, but just `bzr branch exisiting_main new_devel`?
[11:16] <vila> mgz: bzr log -n0 -cmainline:191.1.5 ?
[11:21] <mgz> vila: thanks!
[11:29] <jonathanj> hi, i have a stange problem with locations.conf that has only recently (and suddenly) started happening
[11:30] <jonathanj> for some reason bzr is not matching stanzas in locations.conf that is has been matching for years
[11:31] <jonathanj> i'm using bzr 2.6b1 on OS X 10.7.3
[11:31] <jonathanj> is there some way to debug the matching?
[11:33] <jonathanj> my branch is at /Users/jonathan/Coding/Project/branches/123-branch, i have a /Users/jonathan/Coding/Project/branches stanza
[11:34] <jonathanj> if i remove path elements until a location stanza starts appearing in "bzr config" i end up with /Users/jonathan/Coding, which seems bizarre (hah!)
[11:34] <jonathanj> as far as i can tell there is nothing (nor has there ever been) anything special about the Coding directory
[11:35] <jelmer> jonathanj: this code has been changed recently, so I suspect it's a regression
[11:35] <jelmer> jonathanj: can you file a bug?
[12:03] <jonathanj> jelmer: after a whole lot more messing around it seems that somehow os.getcwd was reporting "Coding" as "coding" (while Finder, pwd, ls, etc, reported it as "Coding"), moving it to foo and back to Coding appears to have resolved all my issues
[12:04] <jonathanj> although on OS X "coding" and "Coding" are actually the same path, so maybe i should file a bug about that
[13:40] <huggie> So I committed, pushed but it was wrong.  I'd like to undo that.  I found uncommit and revert and now I'm back where I should be but I can't push.  I tried an empty commit and now I've diverged.  Um, help? ;)
[13:40] <jelmer> huggie: you can discard the remote history using "bzr push --overwrite"
[13:41] <huggie> Aha.
[13:44] <huggie> Woo.  After a little time launchpad updated too.
[13:44] <huggie> jelmer: Thanks, that was perfect :)
[15:58]  * mgz blames jml here instead
=== hazmat is now known as kapilt
[15:58] <mgz> skip on twisted and unittest should not use incompatible exception classes
[15:59] <jml> backwards compatibilit
[16:00] <mgz> is it actually impossible to skip a test in such a way as it'll not count as a fail on one of trial or unittest -m?
[17:26] <james_w> https://code.launchpad.net/~james-w/udd/packages-last-update/+merge/101009
=== deryck is now known as deryck[lunch]
=== kapilt is now known as hazmat
=== deryck[lunch] is now known as deryck
[21:54] <ribe> When I do MERGE/ POOL main branch to my branch msg is 'there is nothing to do', but right after that if I do merge my branch into main there is changes to commit. How is that possible?
[21:55] <ribe> I'm truing to revert some changes btw, and can't update my branch to current version of main branch...
[22:08] <ribe> How to revert my branch to privies version and the do update/pull the current version of the main branch?
[22:09] <jelmer> ribe: 'bzr pull --overwrite <main-branch-url>' ?
[22:14] <ribe> jelmer: that may help, just that I using Bzr explorer...need to check out how to do that in terminal...