/srv/irclogs.ubuntu.com/2012/03/26/#bzr.txt

kbulgrienwow.  Personally, I am not a fan of commit whole workspaces at once.  That means bad checkin comments.  And when I am the guy that debugs other's work, I hate bad checkin comments and large commits.00:32
lifelesskbulgrien: you can commit less than the whole00:33
lifelesskbulgrien: its merely a default00:33
lifelesskbulgrien: however, all of (git, hg, bzr) share this assumption that you want whole tree versioning00:33
pooliekbulgrien, there's also some support for per-file commit messages00:34
poolieit's not generally used though00:34
pooliekbulgrien, i'm in favour of people making small changes and then committing the whole change00:34
pooliewhen people commit only part of the changes to their tree00:34
pooliethere's a good chance that what they committed was never actually compiled or tested as a whole00:35
kbulgrienI've just traditionally been the guy who had to fix other people's stuff.  Normally its not the author that cares about commits.00:35
pooliei think you need a new tradition :)00:35
poolieand maybe a water pistol00:35
kbulgrienPerhaps.  It'00:35
kbulgriens a job.00:35
kbulgrienWater pistol. hmm. never thought of that.  maybe a super soaker.00:36
kbulgrienBut then that doesn't work when the other guy isn't around anymore.00:37
pooliethat's true, what's done is done00:37
kbulgrienas far as defaults on operating on the whole tree goes, that's not necessarily something I feel is worth getting bent out of shape about.00:38
kbulgrienNot that there is much worth getting bent out of shape about, but...00:38
kbulgrienits an expression.00:39
fullermdNono, it's _best_ when they're not around any more.  That way they never expect it!00:39
fullermdFor me, I was glad to get the full-tree action by default.  Took some getting used to, but still.00:40
fullermdLook over my old CVS commits, you'll find way too many "Whoops, here's the rest of some recent change that didn't get committed 'cuz I wasn't high enough in the tree"00:40
poolieyep00:41
kbulgrienwon't happen for me.  If I don't know what I'm committing, I don't have any business committing, IMO.00:41
fullermdTyping "cd ../../../../../.. ; cvs diff ; cvs ci" gets old real quick.00:41
fullermdI tried for a while having a whole separate freakin' xterm that always stayed in the root of the checkout so I could do my diff's and ci's from there.  It was just too stupid though.00:42
kbulgrienpeople think fast is fast, but its usually not. slow (careful) is faster than fast.00:42
kbulgrienI see it all the time.00:43
fullermdTrue, but stupid tools are slower than slow.00:43
kbulgrien:-)00:43
kbulgrienAnd some discussions are like tarpits ;-)00:43
lifelessfullermd: pushd $(cvsroot .);cvs diff -Nrup; popd00:44
lifelessfullermd: where cvsroot is something you can write00:44
fullermdThings that make committing less convenient tend to make you less likely to commit.  And that leads to way worse commit logs   ;)00:44
kbulgrienhmph.00:45
kbulgrienDiscipline is discipline.00:45
kbulgrien:-)00:45
fullermdAnd eventually to the guy whose every commit log is "It's 4:30 on Friday, here's this week's work".  And then there's yelling, and screaming, and discharge of firearms inside city limits, and lawsuits, and...00:45
fullermdThat really slows things down.00:45
kbulgrienThat's a management problem.00:45
fullermdNot any more   8-}00:46
vilahi all06:29
vilahey poolie06:50
pooliehi there vila06:51
poolievila, we can have a chat whenever you like06:53
vilapoolie: see pm ?06:57
mgzmorning all!07:58
pooliehi mgz08:01
Riddellhello former colleagues, would anyone like to a peer performance review for me?08:15
mgzless of the former08:18
mgzmaybe vila or jelmer would like to08:21
mgzwell, I'd like to, but am less useful.08:21
vilamgz: hey !08:21
vilaRiddell: As long as it doesn't require any comment about driving, no problem ;)08:22
Riddellvila: :)08:23
=== quicksil1er is now known as quicksilver
=== jam1 is now known as jam
|_emminghello, could anyone help me out with bzr basics?09:07
|_emmingwhich command do I use to just display the current revision of a remote branch?09:07
jelmerhi |_emming09:08
jelmer|_emming: bzr revno <url>09:08
|_emmingI tried that but it somehow does not work and always keeps telling me "not a branch"09:08
jelmer|_emming: what sort of URL are you specifying, and what's the full error?09:10
|_emmingah it works now, thank09:10
|_emmingjust forgot to specify which branch to look at (stable/testing)09:10
mgzhm, it seems like bugs 839426, 958551, and 963161 are all basically bug 66359309:20
ubot5Launchpad bug 839426 in Bazaar "bzr crashed with UnicodeDecodeError in write_revision_to_string(): 'ascii' codec can't decode byte 0xe2 in position 4759: ordinal not in range(128)" [Undecided,Expired] https://launchpad.net/bugs/83942609:20
ubot5Launchpad bug 958551 in bzr (Ubuntu) "Crash while committing" [Undecided,New] https://launchpad.net/bugs/95855109:20
ubot5Launchpad bug 663593 in Bazaar "String inputs should be clearly defined and validated in commit builder" [Low,Confirmed] https://launchpad.net/bugs/66359309:20
jelmerah, hmm09:20
mgzbut what I don't get is why this new form is only showing up now09:20
jelmerbzr-builddeb's commit hook?09:20
mgzthey're all on bzr-builddeb 2.7.0dev09:20
mgzthe fix is in 2.7.809:21
mgzbut... why the run of recent reports with the different traceback?09:21
mgzwait, linked the wrong bug09:22
mgzmaybe from oneric-proposed picking up a newer bzr version?09:22
mgzbut there not being a corresponding builddeb backport?09:23
jelmerah..09:24
mgzbug 853664 fixes it I think.09:24
ubot5Launchpad bug 853664 in bzr-builddeb "tries to decode debian/changelog as ascii, and fails when it's not" [Medium,Fix released] https://launchpad.net/bugs/85366409:24
mgzhm, maybe I should have duped against the original bug and opened an ubuntu task for Oneiric?09:41
jelmermgz: I think that'd be the most sensible thing09:41
mgznot that I'm sure backporting dev stuff is really the right thing, we expect everyone doing this to switch to Precise shortly right?09:41
jelmeryes09:42
jelmer(to both questions)09:42
=== jam3 is now known as jam
=== yofel_ is now known as yofel
vilaanyone knows a way to *change* a root-id ?15:22
vilabug #965403 took me off-guard :)15:22
ubot5Launchpad bug 965403 in Bazaar "all bzr plugins use TREE_ROOT as their root-id as does bzr itself" [Undecided,Confirmed] https://launchpad.net/bugs/96540315:22
jelmervila: I know how to do it programmatically, but not from the cli15:31
jelmervila: perhaps we should have a (hidden) 'bzr refresh-file-id' command?15:31
vilajelmer: it's a delicate issue as I'm not sure you can still merge branches with different root-ids then15:35
jelmervila: you can, but you get conflicts when the other branch has added files15:35
jelmerthose conflicts can be resolved though15:35
jelmerI have a few projects (especially packaging branches) where that's the case15:35
vilahmm15:35
vilaI seem to be able to work around my issue by join'ing twice15:36
jelmerwhu?15:36
vila(and some more hackery)15:36
vilaI created an empty branch to get a new root-id, join bzr-webdav into that, moved files, joined the resulting branch into bzr15:41
jelmerah, right - that's another way of changing the root id15:41
vilaoh, committed --unchanged after 'bzr init' to make sure jion won't get the webdav root-id ;)15:42
vilayeah15:42
vilaat least in this use case, I won't ever try to merge this branch back into lp:bzr-webdav15:42
=== deryck is now known as deryck[lunch]
jelmervila: any chance of a quick review of https://code.launchpad.net/~jelmer/bzr/2.5-config-help-topics/+merge/99372 ?17:03
vilajelmer: EOD'ing, but I will PP as hell tomorrow, I swear :)17:04
jelmernevermind, you already merged it :)17:04
* jelmer should've updated his 2.5 branch17:04
* vila blinks :)17:04
jelmerthat's the help topic fix for config options17:04
vilayeah, merged long ago no ?17:05
jelmerah, actually - no17:05
jelmerI'll let you look at it tomorrow17:06
jelmerhave a great evening :)17:06
mgzah, it's not in 2.5.1? the bug is wrong?17:06
mgzand 2.6b1 isn't active any more...17:07
* mgz does some juggling17:07
jelmermgz: it's not fixed in 2.5 yet, only in 2.6b117:08
vilajelmer: make sure it doesn't trigger the doc building error for sphinx ?17:08
vilajelmer: not sure they are related but ~worried17:09
vilajelmer: bah, I'll check it myself tomorrow, don't worry17:09
jelmervila: I'm not sure why the two would be related?17:09
jelmerworks for me :)17:09
vilajelmer: I don't remember the details 'make dosc-sphinx' ?17:09
jelmerno, that's a different issue17:10
jelmerthis is 'bzr help branches'17:10
vilaok17:10
* vila really off ;)17:10
=== deryck[lunch] is now known as deryck
mgzha, its great when writing some silly trivial test... and it actually fails because of a bug18:42
dakiraHi. I just pulled an ubuntu source package using bzr (bzr branch lp:ubuntu:precise/package) and fixed a bug. I already pushed a private branch to launchpad (lp:~me/ubuntu/precise/package/fix). Do I just propose this for merging now, or is the process for ubuntu packages different?19:23
diodorhi19:42
diodoris there a way to create a branch from a subdirectory of a branch?19:42
=== jml_ is now known as jml
pooliehi all20:21
mgzhey poolie20:21
mgzmust be time for me to descend20:22
poolieah, probably20:22
poolieyeah that is pretty late20:23
poolieyou're on dst now?20:23
wgzpoolie: yep20:25
pooliesleep well, i'll see you tomorrow20:25
jelmer'evening wgz, poolie20:26
pooliehi there20:27
mwhudson:(20:33
poolie?20:33
mwhudsonjelmer: what does "AssertionError: Invalid sha for <Commit bea9a47ad0d16bcfbe30b73f78730e351e25a881>: fc4e5248d29cf7264481cbff82343eade5fcc2ca" in a failing import mean again?20:33
mwhudsonjelmer: it's killing https://code.launchpad.net/~vcs-imports/notmuch/trunk20:34
jelmermwhudson: most likely that it's an import with a merged tag in it20:34
mwhudsonah20:34
jelmerwhich is a new thing in git20:34
jelmermwhudson: there's an open bug against dulwich/bzr-git/launchpad about it20:34
mwhudsoni thought git forbade new things :)20:34
jelmerthat I've been working on - it affects a fair few imports20:34
mwhudsonjelmer: how can i tell if that's the case on the git side?20:34
jelmermwhudson: git cat-file -p <commit-id>20:35
jelmermwhudson: it doesn't really forbid it, but it requires you preserve those fields20:35
jelmermwhudson: dulwich does this, but bzr-git doesn't round trip them properly (since it doesn't know about them)20:35
mwhudsonmergetag object 9325cae5f46e543aedb790cfe62a4faabcba949c20:35
jelmeryep, that's it20:35
mwhudsonok20:35
jelmershould be fixed soon :)20:35
mwhudsoncool :)20:35
mwhudsonanything i can do to help?20:36
mgrandihello20:37
poolieo/20:47
mgrandiare there any plugins or planned features to have nested trees in bzr?20:47
mgrandilike svn does i guess20:47
poolieyes, i think the best at the moment is bzr-scmproj20:47
mgrandiwhat doe scm stand for? oo20:48
mgrandio.o*20:48
pooliesoftware configuration management?20:48
pooliethere is also some work towards built in nested trees20:48
mgrandioh20:48
mgrandithat just seem like it would be nested trees, probably why my google came up empty20:48
jelmermwhudson: some help testing would be great once it's done20:49
jelmermwhudson: also, you should get a more appropriate error with lp:bzr-git20:49
mgrandiim just getting tired of extracting source releases of a library and then copying them over to a source tree i have and then updating =P would be nice to have it automated and just do update or something20:49
idnarwhat project should I report a bug against if I want to complain about lp-propose-merge?22:11
mgrandimight just be the bzr project22:13
mgrandii dont see a bzr-launchpad page on launchpad22:13
jelmeridnar: yep, just the bzr project22:14
idnarokay, thanks22:14
idnarfiled bug #965759 in case anyone else watching is as terminally curious as I am :)22:17
ubot5Launchpad bug 965759 in Bazaar "lp-propose-merge has poor error reporting" [Undecided,New] https://launchpad.net/bugs/96575922:17
jelmeridnar: hmm, that looks like a dupe22:26
jelmerbug 70460622:26
ubot5Launchpad bug 704606 in Bazaar "launchpad.branches.getByUrl() doesn't support properly urlencoded URLs" [Medium,Triaged] https://launchpad.net/bugs/70460622:26
mgrandibut the idea of that it should also say the underlying error so its easier to debug =P22:28
idnarhmm, maybe I was a little unclear22:28
idnaralthough I'm pretty sure #704606 isn't actually related to either of the error messages in my report22:28
idnarbut I'm just complaining that it's impossible to tell what operation actually caused the error messages22:29
idnarnot any of the specific error messages, those were just examples to show how hard it is to figure out what went wrong22:29
mgrandithat should be pretty easy22:31
mgrandiyou just have the original error message + the exception that originally got called22:31
mgrandiunless there is some standard on how error messages should look that im not aware of22:31
idnarI believe the first error message was actually caused by having submit_location set to something not on launchpad (at least once I fixed that, it stopped happening)22:31
idnar(not really sure what caused the second one about diverged branches, I reran the same command later and it worked without me apparently changing anything; I think it may just have been Launchpad's bzr mirror catching up too slowly or something)22:33
mgrandihmm maybe22:34
idnar(the last thing I did to the branch I was submitting before trying to run bzr lp-submit was a push --overwrite)22:35
idnaranyhow yeah, not directly relevant to my actual bug report22:35
jelmeridnar: bug 704606 is the cause of the second bug in your bug report22:36
ubot5Launchpad bug 704606 in Bazaar "launchpad.branches.getByUrl() doesn't support properly urlencoded URLs" [Medium,Triaged] https://launchpad.net/bugs/70460622:36
jelmersorry, the first22:37
idnarhuh, okay22:37
idnarI don't really understand why urlencoding would have anything to do with it22:37
idnarthe URL would have been something like file:///home/mithrandi/code/blahblah without any + signs or anything like that22:38
idnaroh it might have had a . in it22:38
jelmerah, oh22:39
jelmerso it's just the same error message but a different cause22:39
jelmernever mind me then :)22:39
idnarokay :)22:40

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!