/srv/irclogs.ubuntu.com/2008/11/08/#bzr.txt

aboSamoorI am trying to add svn folders to bzr, I got this message "bzr: ERROR: Permission denied: ".": PROPFIND request failed on '/svn/trunk'"00:57
lifelesssee my reply in #launchpad01:08
=== Spaz is now known as Paradoxataur
=== AfC1 is now known as AfC
Peng_Err.. bzr just did an autopack. .bzr.log said it was packing from 14 packs to 10, but instead it packed them down to...3. I don't get it.03:55
Peng_(I mean, it was right about there being 14 initially.)03:56
lifelessPeng_: it lied09:08
lifelessPeng_: please file a bug09:08
lifelessPeng_: (what it really meant was 'all but two of the packs needs to be combined' -> 3 (its simpler and more efficient than the original code09:09
lifelessbut the debug output is the original plan of what would happen09:09
Peng_Oh.09:15
Peng_It should've combined them into 2 packs anyway. It left one with only like 2 revisions in it. :\09:17
lifeless  Peng_ well, could be a bug09:23
Peng_Wait...what do you mean? It was originally going to leave 10 packs, but changed its mind after writing the debug message?09:24
Peng_Well, I filed bug 295486. Kinda crappy title though.09:25
ubottuLaunchpad bug 295486 in bzr "Autopack's debug output is wrong about how many packs will be left" [Undecided,New] https://launchpad.net/bugs/29548609:25
Peng_lifeless: Not to be a stalker, but you seem to have identical branches at lp:~lifeless/+junk/bzr-index2 and lp:~lifeless/+junk/index2.09:51
=== jszakmeister|awa is now known as jszakmeister
fullermdPeng_: Don't try and act innocent.  We all saw you checking out his branches.10:30
=== jszakmeister is now known as jszakmeister|awa
RedLizardWhat is usually done with a feature branch once the feature is stable and has been merged into the trunk? I don't want it to clutter the branch namespace for all eternity, yet I do want it available for all eternity.13:50
LarstiQRedLizard: I usually do nothing to it, or move it out of the way.13:54
ymlHello, I am having some hard time to understand how to make bzr happy after a big reorganisation in my project.13:54
RedLizardLarstiQ: i would like to mark it as "closed for development" in some way13:55
LarstiQRedLizard: mv it to done/ ?13:55
ymlIn fact I have moved/rename some folder in the terminal an now I try to make bzr aware of this modification13:55
LarstiQyml: bzr mv --after oldname newname13:56
LarstiQyml: this may be a little tricky if you have also done renames of children of that directory, it is doable but a bit more work than ideal13:56
ymlLarstiQ:  thanks I am going to try this13:56
ymlLarstiQ: I have not done any renaming of the children13:57
RedLizardLarstiQ: that should work, i think13:57
LarstiQyml: good :)13:57
ymlLarstiQ:  bzr mv --after django_glue/* projects/simple_project/13:57
ymlbzr: ERROR: Could not move to simple_project: projects/simple_project is not versioned.13:57
LarstiQRedLizard: ime that is enough to clear the namespace isssue.13:58
LarstiQyml: are you sure that is what you want?13:58
LarstiQyml: could you describe the rename you did?13:58
RedLizardLarstiQ: optimally, i'd like the branch to be destroyed, and its history contained in the history of the trunk, available by "zooming in" on the merge commit13:59
LarstiQRedLizard: if not, you can always delete a branch, since it's revisions are all merged into trunk, you can always recreate it when necessary13:59
LarstiQRedLizard: but why bother?13:59
LarstiQthe burden of keeping around old branhces is very low13:59
ymlBzr was aware of a folder named django-glue in the root of my bzr directory then I did mv django_glue projects/simple_project14:00
LarstiQyml: right, so it looks to me that should be 'bzr mv --after django_glue projects/simple_project' then14:00
RedLizardLarstiQ: because otherwise, i'd have to keep my branch names unique for all eternity14:00
LarstiQyml: without the /* wildcard, that would be moving the children of django_glue, not django_glue itself14:00
RedLizardLarstiQ: i can't call my branches 'test' or something similar14:01
ymlLarstiQ: bzr mv --after django_glue projects/simple_project14:01
ymlbzr: ERROR: Could not move to simple_project: projects/simple_project is not versioned.14:01
ymlsame thing14:01
LarstiQRedLizard: eh, a branch called 'test' imo is not worthy of staying around, nuke it :)14:01
LarstiQyml: what version of bzr are you using? and is projects/ versioned?14:01
RedLizardLarstiQ: but the history will still be available in the trunk? great :)14:01
LarstiQRedLizard: yes, absolutely14:02
RedLizard:)14:02
ymlno project is not yet versionned14:02
LarstiQ`bzr branch trunk -r tip_revision_of_test resurrected-test` to bring it back14:02
ymland I amusing bzr : Bazaar (bzr) 1.3.114:03
LarstiQyml: did projects/ previously exist, or did you mkdir it for this reorginasation?14:03
ymlI mkdir project14:04
ymlfor this reorganisation14:04
LarstiQyml: try 'bzr add --no-recurse projects/' before you do the mv --after14:05
ymlsame thing14:06
ymlI also try to bzr add projects/simple_project before doing the mv but it also didn't work14:07
LarstiQright, that you do not want to do14:08
LarstiQyml: in my small test it worked, but let me try with 1.3.1 instead of 1.914:08
ymlLarstiQ: Is there an easy way to update to 1.9 on ubuntu14:10
ymlby easy I mean sudo apt-get install ...  :-)14:10
LarstiQyml: yes, there is14:11
jelmer'morning yml, LarstiQ14:11
LarstiQmoguh jelmer14:11
ymlok so might be an option if you found out that it is not working with 1.3.114:11
LarstiQyml: use the bzr ppa, https://launchpad.net/~bzr/+archive14:11
LarstiQyml: just a moment though14:12
LarstiQyml: I'll give you my test script, maybe what I'm doing is too simplistic and doesn't actually cover your case14:12
ymlok14:13
LarstiQyml: indeed, 1.5 and up succeed where 1.3 does not14:16
LarstiQyml: http://rafb.net/p/AFkUPw64.html fwiw14:17
ymlLarstiQ: Excellent news14:18
ymlLarstiQ: so now I just have to move to the latest bzr14:19
ymldoes bzr-svn is working on 1.9 ?14:19
jelmeryml: yes, with bzr-svn 0.4.1414:19
LarstiQjelmer: oh! you did a release, sweet!14:20
ymljelmer: How can I install it on ubuntu ?14:20
ymlapt-get install ?14:20
jelmerI don't think it's been uploaded to the PPA yet or synced from Debian14:21
LarstiQthe ppa has 0.4.13-214:21
jelmeryou may be able to install the Debian package or otherwise install from source14:21
ymlLarstiQ: thank you very much for your help14:30
yml1.9 solve my issue14:30
ymlIs it just me and my happyness or does bzr status is faster ?14:31
ymljelmer: do you have an idea when the PPA will be updated?14:31
LarstiQyml: there have been improvements to status speed between 1.3 and 1.9, so that's entirely possible :)14:32
ymlThank you so much for your effort in bzr14:35
ymlfor some reason that I cannot explain I just feel good with it14:35
ymlthe only thing missing to me at the moment is a bzr-git14:36
ymlit is such a pain for me each time I have to work with git14:36
jelmeryml: you may want to subscribe to bug 29300914:37
ubottuLaunchpad bug 293009 in bzr-svn "Bzr-svn conflicts with bzr in the PPA" [Undecided,New] https://launchpad.net/bugs/29300914:37
ymljelmer: I am actually on hardy14:41
ymlbut I get the same error message when I try to apt-get install bzr-svn14:42
jelmerthe packages are always uploaded for all ubuntu releases at the same time14:42
ymlthank I will wait for its resolution14:44
Flyser_Hi. is it possible to use bzr for my local repository and then push it to a remote svn server?15:05
=== abadger19991 is now known as abadger1999
jelmerFlyser_, hi15:16
jelmerFlyser_, yes15:16
jelmerjszakmeister|awa, hi17:16
RedLizardHow can I restore a branch that I merged into some other branch in the past?18:47
luksRedLizard: get the latest revision number of the merged branch and run: bzr branch -rX orig new18:49
RedLizardand how do I get the latest revision number of the merged branch?18:51
RedLizardit doesn't appear in `bzr log`18:51
luksit should, if the branch was merged18:53
luks(and you don't have bzr log aliased to something like bzr log --short)18:53
RedLizardhttp://pastebin.com/m60c521ed18:54
RedLizardno revision number there18:54
LarstiQRedLizard: revid:redlizard@ruud0-20081108134022-03073670ea55866a18:57
LarstiQRedLizard: what version of bzr is that?18:57
LarstiQor, what custom logformatter are you using?18:57
lukswhat version of bzr is it?18:57
RedLizard0.11.018:57
LarstiQright :)18:57
LarstiQRedLizard: etch?18:57
RedLizardyup18:58
* LarstiQ hasn't seen that log output in a loooong time18:58
luksme neither :)18:58
luksI was confused by the merged line18:58
LarstiQRedLizard: anyway, `bzr branch -r revid:redlizard@ruud0-20081108134022-03073670ea55866a resurrect`18:58
LarstiQRedLizard: veel plezier :)18:58
LarstiQRedLizard: (fwiw, we're up to 1.9 now)18:59
* RedLizard wonders what gave him away18:59
LarstiQRedLizard: 'gemerged'18:59
RedLizardah :)18:59
RedLizardit works19:01
RedLizardgood :)19:02
RedLizardIs there any reason I should _really_ upgrade from 0.11.0?19:05
LarstiQIf you're not interacting with anyone else, 0.11 will work fine.19:06
LarstiQThat is, other bzr branches might be in a format 0.11 does not understand.19:06
LarstiQAnd, if you're asking for help, it pays to mention the version you're using :)19:07
RedLizardyes, i noticed19:07
RedLizard(stupid debian testing on development servers :p)19:07
LarstiQhmm, isn't testing lenny by now?19:08
RedLizardyes19:08
LarstiQthat should have bzr 1.519:09
RedLizardit does19:09
LarstiQwhich, for this discussion, has a logformat that looks more familiar to us ;)19:09
RedLizardare the ubuntu packages on launchpad debian etch compatible?19:12
LarstiQin the ppa? I believe not19:13
LarstiQRedLizard: do you need a system wide bzr? Or is running from source good enough?19:14
LarstiQRedLizard: 1.5 is in etch-backports fwiw19:14
luksetch-backports has 1.519:14
lukshe19:14
* luks is too slow19:15
RedLizardLarstiQ: yeah, but then i'd get the entire backports repository19:15
LarstiQRedLizard: personally, I run bzr from ~/src/bzr/<version>/bzr19:16
RedLizardhm, given that bzr depends only on python, the ubuntu packages will probably work fine on etch19:18
* RedLizard tries19:18
luksit contains compiled code19:18
LarstiQand the packaging standards might be different, say python-central19:19
=== Toksyuryel` is now known as Toksyuryel
luksyou might have better luck just dpkg -i the deb from backports19:19
RedLizardwhy doesn't launchpad contain a debian repos as well, by the way?19:20
strkhow to release al stale lock ?19:20
strkheld by strk@gnash on host gnash [process #32194]19:20
luksbzr break-lock19:20
strkthx19:21
RedLizardhm, the ubuntu package doesn't work :(19:21
LarstiQRedLizard: that is something that may happen in the future, but it requires buildd maintenance per suite.19:22
LarstiQRedLizard: as well as the entire archive.19:23
RedLizardtrue19:25
LarstiQRedLizard: so, I'd either try the etch backports .deb, or download and unpack a tarball, and run from that19:26
RedLizardLarstiQ: actually, i think i will build my own debian package19:26
LarstiQok :)19:27
RedLizardwill `bzr branch` respect the repos format of the origin?19:30
LarstiQRedLizard: if it can, yes.19:30
LarstiQso branching from 0.11, hack hack, 0.11 should be able to pull the changes back19:31
LarstiQRedLizard: just don't `bzr upgrade` it with 1.9 :)19:31
RedLizardLarstiQ: of course19:31
LarstiQor branch it into a shared repo that uses a different format19:31
RedLizardhm, you really have to be quite careful when working together using different bzr versions19:33
RedLizardespecially if you don't use a single repository for everything19:34
* LarstiQ blinks19:35
LarstiQRedLizard: what do you mean? Having one repository for all your branches would make collaborating with older clients almost impossible.19:35
LarstiQRedLizard: do note 0.11 is over 2 years old (roughly half the projects lifetime) and pre 1.019:37
RedLizardLarstiQ: unless the repository is in an old format19:37
LarstiQRedLizard: which then makes other things impossible, like, say, bzr-svn19:37
RedLizardLarstiQ: so, the only solution is to make sure everyone uses the latest version at all times?19:38
jelmerRedLizard, the current default format has been supported since version 0.92, which is about a year old19:39
LarstiQRedLizard: no, if you have one repository per project (which is good practice anyway), you should have an easy time of staying compatible with the least capable clients that work on that project19:39
LarstiQRedLizard: that should reduce the friction to a level of not having to think about it19:39
RedLizardLarstiQ: good point19:41
RedLizardjelmer: good, that makes things easier... getting everyone to run >= 0.92 looks reasonable19:41
LarstiQRedLizard: if you just have standalone branches, the only point where you run into trouble is by running upgrade yourself.19:41
LarstiQRedLizard: but yeah, there is room for error19:44
RedLizardLarstiQ: not much if the default format is quite old19:45
LarstiQRedLizard: right, in default cases you're safe19:45
LarstiQRedLizard: but it's still possible to have a non-default repo, branch something old into that, work, try to get it back in, and notice the format got upgraded when you branched it19:46
RedLizardLarstiQ: won't it be saved in the default format again when merging it back in?19:47
LarstiQRedLizard: if it's compatible, yeah. Not so when you are trying to stuff rich-root in non-rich-root19:48
LarstiQ</gripe>19:48
* LarstiQ has some dinner and goes off to a verdiepingsfeetsje19:48
LarstiQmodulo spelling bugs19:48
RedLizardhave fun19:49
LarstiQthanks19:49
RedLizardHow can I init a branch on a remote server?19:57
Kinnisonbzr init sftp://blahblahblah19:58
Kinnison:-)19:58
LarstiQRedLizard: bzr init remote/path, or (my preference) work locally and publish changes when you have them19:58
LarstiQKinnison!19:58
LarstiQKinnison: how are you?19:58
KinnisonLarstiQ: Good thanks, busy busy busy :-)19:58
RedLizardbzr: ERROR: sftp://$PATH/.bzr/ is not a local path.19:58
LarstiQKinnison: that explains the not having seen you in a while ;)19:59
KinnisonLarstiQ: well that, and not going to any ubuntu/canonical confs due to lack of cash :-)19:59
LarstiQRedLizard: yeah, I may have fixed that post 0.1119:59
RedLizardLarstiQ: this is using 1.519:59
* LarstiQ blinks19:59
LarstiQRedLizard: do you have paramiko installed?20:00
RedLizardLarstiQ: yes20:00
RedLizardLarstiQ: i do have a bazaar config file automatically created with 0.11, if that matters20:00
LarstiQRedLizard: it works for me, what exact command did you try? (~/src/bzr/1.5/bzr init sftp://localhost/tmp/hagedis in my case)20:01
RedLizardLarstiQ: which, on inspection, does not contain anything relevant20:01
RedLizardLarstiQ: update: it gives me that error message, but it has in fact succeeded20:02
RedLizardLarstiQ: that is, on trying it a second time (unmodified), i get:20:02
RedLizardbzr: ERROR: Already a branch: "sftp://10.0.2.100/home/redlizard/repo".20:02
RedLizardLarstiQ: also, i forgot: i init-repo'd that directory just before init'ing it20:03
LarstiQI recall old code trying to open a workingtree on the branch that just got inited, even when remote. It sounds roughly like that.20:03
LarstiQRedLizard: ah.20:03
LarstiQRedLizard: was that a mistake, or did you conciously do it that way?20:05
RedLizardLarstiQ: i did it conciously20:05
LarstiQok, in that case, why? :)20:05
* LarstiQ files a bug that co-locating a branch and a shared repo remotely gives a confusing message20:06
LarstiQRedLizard: it is not a normal thing to do20:06
RedLizardLarstiQ: really? I thought it is a common optimization20:06
RedLizardLarstiQ: appearantly i misunderstood something; what exactly IS the common optimization using init-repo?20:07
LarstiQRedLizard: the optimization only helps if you store multiple branches in a repository, at which point having the root of repo _also_ be a branch is weird.20:08
LarstiQRedLizard: bzr init-repo sftp://host/repo; bzr init sftp://host/repo/branch;20:08
RedLizardLarstiQ: i use (read: am planning to use) the "nested branches" layout20:09
RedLizardLarstiQ: in which case having the shared repo also being the root branch sounds logical20:10
LarstiQRedLizard: it could be. I still doubt it.20:10
RedLizardLarstiQ: what's so strange about it?20:11
LarstiQRedLizard: the relation of the branch at the root to the other branches.20:12
RedLizardLarstiQ: otherwise, i would have /host/project (a --no-trees repo) containing only a directory trunk (a branch) containing other branches (recursively)20:12
RedLizard*containing only a directory "trunk"20:12
LarstiQRedLizard: ah, I think I see what is going on here.20:13
LarstiQRedLizard: what branches are in trunk/ then?20:14
RedLizardLarstiQ: feature branches, probably20:14
RedLizardLarstiQ: see section 10.2.2 of the user guide20:14
LarstiQRedLizard: why wouldn't they be siblings of trunk, instead of children?20:14
LarstiQRedLizard: just a moment, still filing that bug20:15
RedLizardLarstiQ: because they are created from trunk, and will ultimately be merged back into the trunk (a clear parent-child relation)20:16
RedLizardLarstiQ: and child objects residing in the parent directory is a Good Thing from a logical standpoint20:18
LarstiQRedLizard: hmja. I disagree about there existing a parent/child relationship, but I see your point.20:19
* LarstiQ looks at the user guide20:19
RedLizardLarstiQ: permanent forks (say, splitting off 2.6 (the new unstable) from 2.4 (stable)) would be siblings of trunk20:19
RedLizardLarstiQ: which, come to think of it, is a good reason not to have trunk equal the repository root20:20
LarstiQRedLizard: right. From my point of view any branch is equal in footing to trunk.20:21
RedLizardLarstiQ: even feature branches, which only exist for a short period of time, only to be merged back into the trunk?20:22
LarstiQRedLizard: yes. But they're not very likely to exist in a central repository anyway, but live on my machine.20:23
RedLizardLarstiQ: unless you work on a project on multiple machines20:23
LarstiQRedLizard: but I see some merit in nesting like that.20:24
LarstiQRedLizard: https://bugs.edge.launchpad.net/bzr/+bug/295704 btw20:24
ubottuLaunchpad bug 295704 in bzr "Colocating a branch a repository remotely complains about .bzr not being a local path" [Undecided,New]20:24
pygihello people20:25
LarstiQhmm, should be 'and' instead of 'a', a well20:25
pygime needs some numbers about bzr if possible20:25
pygianyone awake? :)20:27
LarstiQpygi: you didn't ask a question yet ;P20:27
pygitruuue :)20:27
pygibasically, number of projects using bzr, and some high-profile names of projects ;)20:28
LarstiQRedLizard: I still think it's unnatural, but I might be oldfashioned ;)20:28
* LarstiQ doesn't know of research into the former20:29
jelmerpygi, http://bazaar-vcs.org/WhoUsesBzr20:29
pygijelmer, ok, and how about number of downloads? :)20:30
jelmerpygi, I don't think that's easy to track20:30
pygijelmer, indeed it isn't20:30
jelmeras most people get bzr from their distribution20:30
pygijelmer, right20:31
pygijelmer, just trying to convince some people to do some bzr stuff, and this will help ;)20:32
LarstiQpygi: who are those people? Are they convinced by 'ubuntu, launchpad, mysql'?20:32
pygiLarstiQ, O'Reilly :)20:33
LarstiQpygi: aha :)20:33
jelmerpygi, you may want to check ubuntu's popcon20:33
pygiLarstiQ, I think mysql accounts for lot more then ubuntu & LP ;)20:34
jelmerpygi, IIRC that lists bzr as the second most popular DVCS20:34
LarstiQpygi: depends what they are looking for20:34
pygiLarstiQ, true that too20:35
pygiLarstiQ, I guess adoption rate by external projects20:36
LarstiQpygi: right20:37
pygiLarstiQ, and we can't really consider LP & ubuntu external :p20:37
LarstiQpygi: tried the very scientific approach of looking at amount of google hits?20:38
* LarstiQ now really is off20:41
pygiLarstiQ, laters, and thanks20:41
pygijelmer, thank you too, data sent ;)20:45
jelmernp, hope you can convince them :-)20:45
lifelessPeng_: yeah, its the 'locations defaults override remember values' annoyance; I really must fix that20:46
pygieveryone wants to do a Git book, but bzr one is different stuff...20:47
RedLizardpygi: probably because bazaar is easy enough that you can use it without a book :p20:48
pygiRedLizard, actually, I'm talking from publishers POV ...20:49
PieterI'd guess it is because there are more git users20:50
pygiPieter, indeed20:50
RedLizardpygi: I was just kidding. I guess git is popular for one reason: that the linux development team uses (and wrote) it ;)20:50
RedLizardtherefore, instant fame20:50
jelmerafaik there was a bzr book on the way20:51
Pietergit didn't become really popular until about a year ago, and it's been in use for the kernel for 2-3 years now20:51
jelmernot sure how far they got though20:51
pygijelmer, yea, I heard that too ... but nothing new on it since ages ...20:51
pygiI talked about the book with few people here some time ago :)20:52
pygiPieter, well, it was VERY unfriendly before20:53
* jelmer still uses git reluctantly20:58
pygijelmer, what project do you use it for?21:01
jelmersamba mainly, but also several other projects I've contributed to (ikiwiki, loudmouth, etckeeper, btslink)21:02
pygiaha21:03
jelmerthis is one of the reasons why picking a vcs is so different than picking an editor - it affects not just you, but the rest of the project as well21:03
pygitrue21:04
Pieteryou can always use git-bzr ;)21:14
jelmer:-)21:18
jelmerSeriously though, I'm not sure how that helps me, it still forces me to use the git UI21:18
Pieteronly to push to git, you can use bzr for all the other stuff21:20
jelmerDoesn't gain me an awful lot, it still e.g. requires a local copy of the git repo and a more complex way to upload to the remote git repo21:21
jelmerbzr-git should come close, once I finish implementing remote fetch support21:21
Pieter:) I guess it's more useful the other way around, as git has real branch and remote support21:24
jelmerI would say it the other way around, being the bzr adept that I am :-)21:24
jelmergit requires you to fetch data locally before you can do anything with it, bzr allows you to work directly on remote data21:25
jelmerit would indeed be nice to have git-like branches in bzr, I think that's actually my top-wishlist-item atm21:26
pygijelmer, wasn't there some work going on getting those?21:31
jelmernot afaik21:33
jelmerit shouldn't be too hard to implement, just nobody hasn't done it yet21:33
jelmerand it would require a format change21:33
emmajaneIn other news: this is the best use of the internets ever... live web cam of PUPPIES. http://cdn1.ustream.tv/swf/4/viewer.45.swf?cid=31701621:33
* emmajane apologies and encourages you to resume normal activities. :)21:34
jelmerlol :-)21:34
emmajane:)21:34
* jelmer fears he'll just end up looking at puppies all evening, rather than adding new awesome bzr features21:36
emmajaneLOL21:36
emmajane+121:36
emmajanejelmer, screen casting has just taken a dramatic back seat to puppy watching. :)21:38
Pieterit has sound too \o/21:39
jelmeremmajane, :-)21:40
emmajanePieter, yup :)21:40
emmajanemust be supper time?21:40
Pieterthat's what they thought21:40
jelmerand there's 8000 more people watching, amazing21:40
emmajaneone of them have been assigned box duty... for our viewing pleasure. :)21:40
emmajaneback later. :)21:42
pygijelmer, more format changes :P21:46
pygijelmer, I don't think people would like that :)21:48
jelmerbeer o'clock22:21
jelmerg'night *22:22

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