/srv/irclogs.ubuntu.com/2008/05/09/#bzr.txt

igcmorning00:01
jammorning igc00:02
jamlifeless: you're going to make the bzr.1.5 branch today, right?00:23
lifelesshttp://laserjock.wordpress.com/2008/05/08/git-and-bzr-historical-performance-comparison/00:31
=== mw is now known as mw|out
mlhfound it  .. http://svn.blastwave.org/trac02:32
mlhoops02:33
* igc food03:40
lamalexHi everyone, how do I commit only a single file so that bzr send will generate a patch for only 1 file04:07
lifelessbzr commit FILENAME04:08
lamalexbzr: ERROR: Selected-file commit of merges is not supported yet: files Do.Addins/src/Do.Universe/ApplicationItem.c04:08
RAOFlamalex: Yup, this was where I was about to suggest ;)04:08
lifelessthis smeans you have done a merge, but not committed the result04:08
lamalexso solution?04:10
lamalexcommit04:10
lamalex:P04:10
RAOFThe shelf plugin can be your friend here.04:10
lifelessdo the commit04:10
lifelessif the branch you are merging is your upstream send won't include changes from the upstream in the sent content anyway04:10
lamalexthanks guys04:12
lamalexoh jeeze! So I did a commit on just the one file after, and bzr send still generated a patch for /all/ changed files04:13
lamalexany idea how to only generate the patch for the 1 file?04:17
jamesh"bzr diff" will give you a diff for one file04:21
jameshbut if you want "bzr send" to give you a bundle for one file, then the bundled revisions need to have changed just the one file04:21
jamesh(relative to the submission branch)04:21
lamalexso I'm SOL for bzr send, and should just diff it04:23
lamalexand advantage of using bzr diff over gnu diff?04:23
jameshwell, you can always prepare the change in a new branch04:23
lamalexignore my previous question04:23
lifelesslamalex: bzr send -r x..y will probably do what you want04:31
lifelesslamalex: it sounds like you want to send in one commit, not all of your work04:31
lamalexyeah04:31
lifelesslamalex: this is the usual confusion that I have seen04:31
lamalexI've had the problem a few times :P04:31
lamalexI always forget how to do it04:31
lamalexwrote it down this time04:31
lifelesslamalex: the name for doing this, irrespective of transport (branch/bundle/patch) is 'cherrypicking'04:32
lamalexthanks04:33
lamalexlifeless: still no luck, I'll just do a diff04:42
jsledlamalex: What's wrong with `bzr diff path/to/file`?04:43
lamalexI was under the impression that bundles were better04:44
jslednevermind; didn't read enough scrollback.04:44
lamalex:)04:44
lifelesslamalex: you probably have more than just one file changed; or are nto using the correct arguments - the list had a good discussion about bzr send just this week04:47
lamalexI'll check it out, thanks for your help04:47
lifelessI'm happy to debug futher if you like; remember though that send's finest granularity is a single commit04:47
lamalexI have to go to bed soon, I have a sociology final in the morning04:49
lifelessgo then !04:50
lamalex:) I've still got 9 hours!04:51
lamalexwell, I guess 6:30 of sleep, but that's plenty. Thanks for the help.04:52
ferringbcurious, for a bzr-svn branch, is there way to effectively convert that into a standalone bzr branch- specifically, converting it to a knit repository?05:10
lifelessbzr-svn branches are native bzr branches05:13
lifelessbzr info will tell yo the current format05:13
ferringblifeless: branched from the svn branch to a "Standalone tree (format: rich-root)"05:19
ferringbfrom there, trying to branch from the standalone into a shared repository (pack-0.92), but getting no love; error msg is essentially "knit pack repository is not compatible with knit repository"05:20
ferringbso... something there isn't right. :)05:22
ferringb(attempts to upgrade the svn branch fail also)05:22
PengYou can't go from a rich-root format (rich-root, rich-root-pack) to a non-rich-root format like pack-0.92.05:23
PengIf you want to upgrade to packs, "bzr upgrade --rich-root-pack".05:24
ferringbbingo05:24
ferringbPeng: that's working for the svn branch; from there, probably will fly for pulling it into my shared repo05:24
ferringbwhat is a 'rich root pack' anyways?  just a new format, or05:25
Pengferringb: rich-root-pack is like pack-0.92, only it has rich roots, meaning it stores slightly more meta data.05:26
Pengferringb: rich-root is like dirstate-tags, only it has rich roots.05:26
lifelessferringb: as peng says, rich-root stores more data; you can't go back to a plain repo from there05:33
lifelessferringb: we will very shortly (probably 1.6 I think) be making rich root our default format05:33
lifelessabentley: around ?05:33
abentleylifeless: Hi.05:34
lifelessany chance of a brief skype call?05:34
abentleySure.  I'm just finishing up something with thumper.05:34
lifeless5 minutes?05:35
abentleySure.05:36
abentleyI couldn't hear you.05:42
lifelessk, thats my work day done; later all06:28
lifelessthanks abentley06:28
abentleylifeless: np06:28
jameshthe "if self.new_inventory_root is None" branch in CommitBuilder.finish_inventory() (bzrlib/repository.py) looks broken06:34
jameshAssertionError doesn't take a "stacklevel" keyword argument06:34
docgnomeI'm running bzr 1.4 under cygwin. Every time I try to do a checkout it spits back bzr: ERROR: [Errno 0] Error07:02
docgnomeany ideas?07:05
Pengdocgnome: You could pastebin the traceback and .bzr.log section. But I dunno how much the developers care about supporting Cygwin.07:06
=== abadger1991 is now known as abadger1999
Le-Chuck_ITAHi there, I don't understand one thing of bzr: is it possible to manage more than one branch in the same local repository?09:04
Le-Chuck_ITAor should I always copy the current directory to a new one?09:04
igcnight all - have a good weekend09:06
=== mrevell is now known as mrevell-lunch
ignashi12:56
ignasanyone has any ideas why i could be getting "bzr: ERROR: exceptions.AssertionError: 2412 != 2413" ?12:56
ignaswhen trying to commit12:56
ignas"assert len(history) == revno, '%d != %d' % (len(history), revno)" to be more accurate12:57
Pengignas: Your revnos are a little off. There's info on either the mailing list or bug tracker, if you can find it.13:11
ignasis it fixable?13:12
Pengignas: Yes, but I don't remember the details.13:12
ignasemm i don't think the fix is in hardy though :/13:16
=== mrevell-lunch is now known as mrevell
ignasthe "production ready" part of bzr is sometimes giving me doubts...13:27
=== jw2328_ is now known as james_w
ignasbzr check is stuck in [                                                             ] checking versionedfile     0/12726 for like 30 minutes14:23
ignasshould i be worried?14:23
=== korpios_ is now known as korpios
=== korpios___ is now known as korpios
jamvila: your patches are going to the wrong mailing list15:33
vilahuh ?15:34
jamvila: you are sending to "bazaar-commits@" not "bazaar@"15:34
vilaaaargh15:34
jamyour merge requests15:34
vilathanks for the heads-up :)15:34
vilahmmm, on another project I took the habit to use 'bzr send', get bitten there :)15:35
vila'bzr send' with no params I meant15:35
jamvila: well, send should do the right thing, but you have to set your 'mail_to'15:35
jamas opposed to you "post_commit_to"15:36
vilaonly post_commit_to seems to be defined...15:38
vilahehe, no, submit_to was defined (with a wrong value), and it's really submit_to, not mail_to15:41
jamspiv: are you still around?15:42
jamvila: anything you want to try to sneak into the 1.5rc1 release today?15:42
vila--starting-with ftw :)15:43
vilabug fixes can wait next week isn't it ?15:43
spivjam: not really ;)15:43
spivjam: I think my big patch should miss 1.515:43
jamspiv: k, I was checking in15:43
jamI would have liked to have it15:43
jambut it seemed a bit large for a last-day approval15:43
jamanything else in the queue?15:44
spivjam: happy releasing!15:44
* spiv -> sleep15:44
vilaspiv: good night15:44
jamigc: ping, for great justice, and things you want in 1.5rc115:44
jampoolie: I know you're not here, but just in case15:44
jamlifeless: Anything you need me to merge for 1.5rc1?15:44
james_wjam: thanks for the weekly report, I think it's a good thing to have.15:45
jamjames_w: well, thank statik as it was his idea, but I agree that it is a good one15:45
james_wstatik: thanks!15:45
jamvila: this is 1.5rc1, so not really15:45
jamvila: we forgot todo a feature freeze bugfix release15:45
statikjames_w: glad you liked it!15:46
jamvila: martin is wanting to get back on schedule, rather than having them all keep slipping15:46
igchi jam15:46
jamigc: you know, I'm always shocked to see you guys awake and online at this time15:46
igcme too :-)15:46
statikjam: igc is an unstoppable code machine, he only closes his eyes to make everyone else feel normal15:46
cody-somerville:)15:47
igcstatik: just finished watching a movie actually ...15:47
vilajam: good, I'm always bad at sync with the releases schedule anyway :) My remark still stands, I'd be happy to have --starting-with (really only the doc tweak requested by martin needs review), the bug fixes I'm issuing today are not urgent, if you don't have the time to handle them, no worries15:47
igcand checking on the Out Of Memory bug that has me intrigued15:47
jamigc: the change you made in fast-import is because it isn't double-buffering15:48
jamMaybe also the lines variable isn't getting GC correctly15:48
jambut doing line.append().... ''.join() has to allocate 2x memory15:48
jamnow, line += '' has to re-allocate as well15:48
jambut IIRC, CPython is able to re-use the memory (using realloc instead of a new malloc/free)15:49
jambut that is a "don't expect this to always work" feature of CPython15:49
vilaigc: you're coding while watching a movie ! Wow, I'm impressed :)15:50
spivStringIO is arguably more likely to use memory better than +=15:50
igcvila: nah - movie over 30 minutes ago15:50
jamigc: Though I'm mostly guessing, anyway anything pressing for 1.5rc1?15:50
vilaand spiv talks while sleeping, those australian guys....15:50
jamI can take a look at your doc patches15:50
spivProbably even better is probably not combining string objects at all.15:50
jamwhile we *can* bring them in later, I'd really like to respect the spirit of a "release candidate"15:50
igcjam: np. I'd really like the plugins+integration doc patch in if it's ok15:52
jamigc: reviewing now15:52
igcthe other one is getting closer ...15:52
igcI'll see if it's worth resending it tonight (or not)15:52
jamigc: does the "part2_intro.txt" belong in the "A brief tour" chapter?15:59
igcjam: yes15:59
jamIt seems like you are starting a whole new chapter/book/etc and that paragraph is "above" that section15:59
igcjam: if we split the chapters into parts, that would be true15:59
igcwe don't have partsa so it's at the start of the first chapter in that part16:00
igcin the current guide, similar text intros "Best practices" fwiw16:00
jamigc: overall bb:approve16:01
jamigc: can you get it sent in now, so it is queued up for me?16:01
igcjam: cool, thanks16:01
igcsure16:01
vilajam: I sent 3 patches, you catch up on the second one (but the third was already send), I re-send the three to the right address16:03
jamI saw a couple of them come in, reviewing now16:04
vilajam: thks16:04
ignashmm, if I have a checkout from a remote bzr shared repository, and run bzr reconcile in the checkout16:15
ignaswill that fix - my local checkout, the revisions from that branch in the remote repository, the whole remote repository?16:16
davidgehi all16:19
ignashi16:19
jamvila: reviews are in16:20
vilajam: thks, what about --starting-with then ;-)16:21
davidgewhat should i do to convert my dir-with-subtree repository to a non subtree one? the only format i can convert without errors is pack-0.92-subtree16:21
jamvila: can I get a --starting-without ?16:21
ignasjam: are you the same person who worked on https://bugs.launchpad.net/bzr/+bug/177855 ?16:21
ubottuLaunchpad bug 177855 in bzr "assertionerror trips on pull --overwrite in dirstate branch with non-canonical history" [High,Fix committed]16:21
jamignas: I am, though today is release day, so I might not have a lot of time16:22
jamignas: "reconcile" fixes the local repository16:22
ignasjam: how do i fix the remote one then?16:22
jamignas: bzr reconcile sftp://url/to/repository16:23
jamthough I might recommend16:23
jamssh host16:23
jambzr reconcile /repository16:23
vilajam: If there is a joke, I miss it 8-/16:23
ignasi think the fix is not in ubuntu yet16:23
ignasor is it?16:23
jamvila: you added --starting-with, I'm asking for -without16:23
jamignas: bug #177855 is not in ubuntu yet16:23
ubottuLaunchpad bug 177855 in bzr "assertionerror trips on pull --overwrite in dirstate branch with non-canonical history" [High,Fix committed] https://launchpad.net/bugs/17785516:23
jamwell, the fix16:23
vilawhat will that means ?16:24
jamignas: I think it is in bzr.dev, and if so, it will be in 1.5rc1 which I am releasing today16:24
ignasif it's not then I would have to get a bzr checkout working on the remote server somehow, then run it there and take care so it would not mess up permissions on the central repository ...16:24
ignasjam: i see16:24
jamvila: I have no idea, it is just the "opposite" of whatever you were trying to do16:24
ignasjam: thanks for fixing it16:24
vilajam: ha ! A joke then ;-) Sorry, a bit slow today16:25
jamvila: well, it wasn't a very good joke, either16:25
fullermdA good joke needs puns, and dancing sheep.16:28
jamvila: could you make it --starting-without-dancing-sheep then?16:29
fullermdYeah.  They're better when they don't come in 'till the second act.16:29
jamvila: so you didn't do the 'auto-prefix' right?16:31
vilano, I think defining aliases is my prefered solution, we could add an auto-prefix for 'bzrlib.' later, I' always very cautious when it comes to UI tweaks a-priori ;-)16:32
jamvila: I don't think you can do it with an alias, just because it won't stack16:33
jambut yeah, I'm okay with bringing this in first16:33
jamas I think it is something we can add later16:33
jamI was also thinking something like16:33
jambzr selftest -s B.T.aoeuaoeu16:33
jamand have B.T always expand to bzrlib.tests16:33
jamand maybe B.P to bzrlib.plugins, etc16:33
jambut that is for discussion16:34
jamcertainly not for your review right now16:34
vilajam: exactly, you just came up with someting better than a raw bzrlib. , let's get more people playing a bit and I'm sure a better scheme will emerge16:34
vilaanother idea was to find a way to enable some completion mechanisms for shell users16:35
jamvila: autocomplete seems hard to do, since you would need to load the tests to figure out how to complete them16:37
jamthough I guess if you had bzrlib.tests/plugins/etc autocomplete it might be a start16:37
vilajam: *I* will settle for something updated one a day...16:38
vilas/one/once/16:38
jamvila: ahh, but how do you handle that I have 20 different branches with different tests available?16:38
jamB.T works fine for me :)16:38
jamI don't have tab completion for bzr turned on yet anyway16:39
vilajam: I just ignore the differences between the 20 branches, that why I said '*I*'ll settle for a good enough solution', but the truth is that, as an emacs user, I already have some completion available ;-)16:41
vilaand my experience is that in most of the cases I will use the option for some test that has failed and for which the ID is one copy/paste away...16:42
igcjam: "Zen" User Guide patch updated and sent to the list16:44
jamvila: I would tend to run "--starts-with bzrlib.tests.test_module_I_am_working_on"16:45
igcjam: I'm off to sleep so please merge it if you think it's now worthy of being approved.16:45
igcnight all16:45
jamigc: well, robert and I seem to be debating16:45
jamso I'll look at it16:45
jambut won't guarantee anything16:45
jamI'm pretty loose about merging docs, though16:45
jamsomething better than nothing, and all16:45
igcjam: sure. What I meant was, if you think robert would no longer think it was confusing16:47
jamigc: I'll try to channel my inner lifeless16:47
jamvila: do you have your patches sent to the PQM ?16:47
jamI don't see them showing up16:47
jamand I have to wait for them to get in before I can finish working on 1.5rc116:47
fullermdjam: Is bug 211661 still likely to be handled for 1.5?16:52
ubottuLaunchpad bug 211661 in bzr "bzr.dev smart client fails on log" [Critical,Confirmed] https://launchpad.net/bugs/21166116:52
vilajam: hold on a sec, I'm working on sending them16:55
jamfullermd: it works for me16:55
jamfullermd: You can still see it failing?16:56
fullermdYah.  Logging my local bzr.dev over bzr+ssh://localhost/ still dies every time.16:56
fullermd(with system-wide 1.4 or local bzr.dev, any combo client/server)16:57
jamfullermd: it works with "--short"16:57
jamthat was my problem16:57
jam--long fails16:57
jamugh16:57
fullermdHm.16:57
fullermdWell, --short fails too, in a different way.16:57
jamfullermd: can you confirm on your side?16:57
fullermdObjectNotLocked: KnitPackRepository('bzr+ssh://localhost/home/fullermd/src/bzr/.bzr/repository/') is not locked16:58
jamfullermd: do you have a weird plugin installed?16:58
fullermdbzrtools, gtk, heads, cvsps.16:58
fullermd(well, and lp of course)16:58
jamfullermd: try '--no-plugins' and '--no-aliases'16:58
jamfullermd: ahh, you know what, my public bzr.dev repo is knits16:58
jamwhich don't give that error16:58
fullermd% env BZR_REMOTE_PATH="dbzr --no-plugins --no-aliases" dbzr --no-plugins --no-aliases log --short bzr+ssh://localhost/home/fullermd/src/bzr/bzr.dev/16:59
fullermdPassword:16:59
fullermdbzr: ERROR: bzrlib.errors.ObjectNotLocked: KnitPackRepository('bzr+ssh://localhost/home/fullermd/src/bzr/.bzr/repository/') is not locked16:59
jamfullermd: unfortunately, I don't know if anyone would be around to review a patch for 1.5rc116:59
jambut maybe a 1.5rc2 or something16:59
jamI'll check into it for a bit16:59
fullermdOh, well.  It's been around a month or so; a few days won't hurt more.17:00
fullermdJust making sure it's at least on a list somewhere   :)17:00
jamfullermd: confirmed both ways17:00
jamThe ObjectNotLocked17:01
jamand the ValueError17:01
fullermdWell, as long as you're safe from being bored, my work here is done   ;>17:02
jamfullermd: I seem to be missing the patch in my bzr.dev17:02
jamweird17:02
jamfullermd: what do you see in log.py line 52617:02
jamI think there might be something wrong with the merge back into bzr.dev17:03
jambecause of how we handled the transaction cache stuff17:03
fullermd        graph.iter_ancestry(mainline_revs) if value is not None))17:03
jambasically, we wanted to pull most of the 1.4 branch back in, but not that patch17:03
jamfullermd: yeah, that should be 'mainline_revs[1:]'17:03
jamaccording to my patch17:03
fullermdI have that in 51517:04
fullermd(on)17:04
jamfullermd: you need it in *both*17:04
jam515 is --short17:04
jam526 is --long17:04
fullermdAh, but that sets revision_ids, which is used....17:04
jamfullermd: and then returns right away17:04
fullermd...  ah, IC.17:04
jamfullermd: so does the bzr 1.4 client work for you?17:05
fullermdOne sec, testing that sub.  Server is spinning, but hasn't output anything yet.17:05
=== mw|out is now known as mw
fullermdMmph.  Passing a minute of CPU time with no output yet...   I guess it's working, but wow that needs some work...17:06
jamfullermd: hmm.. I don't see it in 1.4 either17:07
jamfullermd: you can do "bzr log --long -r ..10"17:07
jamso it doesn't have to do the whole thing17:07
fullermd2 minutes...17:07
fullermdNow I just gotta wait it out and see how long it takes to say anything...17:07
jamfullermd: ok, this is weird17:08
jamI see the patch show up in 3360.1.717:08
jambut the final merge 3363 doesn't have it17:09
jamfullermd: ahhhhhh..... different code paths17:10
jamthere is one at 52617:10
jamand another one at 46717:10
fullermdOK, up to 4.5 minutes of CPU time...  the client-side python process is finally starting to eat some CPU, but still no output   :|17:10
jamThe fix that made it in only fixed 46717:10
fullermd'k, screw it.  6 minutes of CPU burned with no output is Too Damn Long.17:11
* fullermd kills it.17:11
fullermd--limit 10 passed a minute before I killed it...17:13
jamfullermd: it is important to log the first revision17:15
jam--limit 10 might not17:15
fullermdOn bzr.dev it won't   :p17:16
jamfullermd: which is why I recommend -r ..1017:16
fullermdGrabbing ..10 worked, and fairly fast.  But there weren't any merges that early in the history, so...17:16
jamjust to log the first 1017:16
fullermdNow I'm prepping another bug report about the time issue...17:17
jamfullermd: ok, in my patch I clean up all implementations to refuse to handle None17:17
jamand I can see that we are still doing the wrong thing here17:17
jamfullermd: if the object isn't locked at the right point17:17
jamthat could certainly effect performance17:17
fullermdlog --limit 10 locally runs in about 9 seconds.  I'm over 2 minutes of CPU time on the server doing it over bzr+ssh://localhost/ now.  So, there's sure something beating it down.17:18
fullermd(not that 9 seconds is busting any records, but in comparison...)17:18
jamfullermd: that is --long format, right?17:21
fullermdYah, I don't have any aliases affecting 'log'.17:22
jam'time bzr log --limit 10' is 1.3s here17:22
jamwell, that is --short17:22
jam--no-aliases is 2.5s, though17:22
fullermdYou probably have a somewhat faster machine than I.17:22
jamfullermd: can you do "grep -a len .bzr/repository/pack-names"17:23
jamjust curious17:23
fullermd817:24
jamfullermd: not terrible, then17:24
jamI've had it up closer to 2017:24
fullermd--short --limit 10 runs on 0.6.17:24
jamvila: any chance you would feel comfortable reviewing by bug fix for 211661 ?17:24
fullermd(in)17:24
fullermd--line is essentially indistinguishable.  --long runs 8.5-9.17:25
vilajam: I don't think so, I still have to be more familiar with the smart server :-/ And gf is has already thrown a priority interrupt currently masked while I finish sending submissions to pqm...17:28
vilas/is//17:28
jamvila: it isn't really smart server code17:29
jamit is log.py code17:29
jamthe fix is pretty trivial17:29
jambut I understand about priority interrupts17:29
jamvila: and your second submission won't work17:30
jamyou have it set as "bzr+ssh:///"17:30
jamvila: Merge bzr+ssh://bazaar.launchpad.net/~vila/bzr/199440-auth-ssh-user-no-pass http://bazaar-vcs.org/bzr/bzr.dev17:31
jamvila: however, I'll submit something for you17:31
vilajam: rats, I usually do a single submission using the same branch :-/17:32
fullermdFiled bug 228740 for log speed.17:32
ubottuLaunchpad bug 228740 in bzr "log over smart server is *SLOW*" [Undecided,New] https://launchpad.net/bugs/22874017:32
fullermdSad.  8 seconds vs. 7.5 minutes.17:32
jamvila: the other advantage of me submitting it17:33
jamis that if it fails17:33
jamI can resubmit, etc17:33
jamwhile you go sleep17:33
jamor GF time, whatever17:33
fullermdLocking sounds like a good candidate source for the problem.17:33
vilaok, that'be better, I will then tweak 183705 as per your review and let you submit then, I'm a bit worried about NEWS conflicts while doing several submissions like that17:34
jamvila: just send me something I can submit17:35
jamI'll try to work out NEWS17:35
jamfullermd: even weirder is that show_log() calls lock_read() and then hands off to _show_log17:36
jamso everything should be locked17:36
jamok, weird17:39
jambranch.is_locked() == True, branch.repository.is_locked() == False17:39
vilajam: fix for 183705 mergeable from http://bazaar.launchpad.net/~vila/bzr/183705-auth-doc-unclear17:41
jamvila: thanks17:41
jamvila:  I'm glad you have the bandwidth/latency to push stuff up to lp.net17:42
vilaThat surely helps a lot...17:43
jamvila: submitted17:44
jamvila: as an aside, I prefer if you use "#BUGNUM" rather than just "NUM"17:44
jamjust because it makes it possible to grep for bug numbers17:45
viladamn it, I wrote bug NUM ? Endless typos today :-/17:45
jamthough the numbers are big enough now that it is pretty unlikely to have a false positive if you are looking for a specific bug17:45
jam'(vila) Fix 199440 by taking allowing no password in a section'17:45
jamvila: and then I, of course, just copied your message and did the same17:45
fullermdIt was corrupted by being transfered over hhtps.17:46
vilagrr, sure, same here :-/17:46
vilahehe, typed hhtp yesterday but caught it before it was too late ;)17:46
jamvila: have a great weekend, by the way17:46
vilagf re-raising interrupt, thanks jam, can you also submit --starting-with from http://bazaar.launchpad.net/~vila/bzr/faster-selftest/ ?17:48
vilaIt may be a loom, but that's the last thread so it should be easy to find the relevant patch17:48
vilathanks a lot for your work on 1.5rc1, all the reviews, being a good guy, have a nice week-end too, say hi to your son ;-)17:49
jamvila: of course, that means I need to install looms here :)17:50
jamvila: checking out "lp:~vila/bzr/faster-selftest" gives me a non-loom branch which is already merged into bzr.dev18:00
vilajam: first priority handled, 5 minutes freed, you don't have looms installed ?18:07
vilahmmm, I thought that branch was a checkout, it wasn't, pushing right now18:09
vilaok, lp:~vila/bzr/faster-selftest should be good to merge now18:13
vilajam: sorry for the mess :)18:14
vilaon to interrupt #2 now, this one will take longer :)18:14
jamvila: nothing in NEWS?18:15
vilajam: regarding --starting-with ? It should in TESTSING section18:33
jambzr diff -r ancestor:../../bzr.dev NEWS18:33
jamis empty18:33
vilagee, It should be in TESTING section18:33
jamvila: you might have put it in another doc18:34
vilaancestor on a loom branch (or son of a loom), I'm not sure it does what you think it does...18:34
vilaor may be push from a loom branch doesn't do what I thought it should be doing...18:37
vila>-/18:37
vilaOk, I forgot the 'bzr record' before pushing, re-pushing a bunch of revisions18:41
vilajam: the correct revno is 334518:43
jamvila: when I branched from you, the local one is *not* loom18:44
vilathe remote one is not either (I think) but anyway, the current tip on that branch should now be at 3345 and ok for you to branch even without loom18:45
jamvila: 3345: merge bzr.dev, fixing simple conflicts18:45
jamvila: and the change is in NEWS18:45
jamlooks good18:45
vilaI really appreciated loom for that branch, but I lack the deep understanding when it comes to sharing a loom,18:46
jamvila: well, AIUI there have been some bugs about pushing stuff out of a loom18:50
vilayeah, I saw  a patch about that, may be I've just been lucky that bzr record allowed to push the right revisions a few minutes ago :)18:51
nysinWhen trying to rebase, I see "bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified." (this is accurate as far as bzr knows but they in fact roughly do. If necessary I can try to supply an exact analog-revision but hopefully it's not.)19:27
=== mw is now known as mw|food
nysinI've tried using --onto but without success - so, can one specify 'I, the user, am stating that revision X from branch Y and revision Z from branch W are the same'?19:29
james_wnysin: specifying a merge base means to give a start to the range in the -r argument20:14
james_wif you say "merge -r 20" it will merge in revision 20 of the other branch20:14
james_wand all of it's ancestors20:15
james_wif you say "merge -r 10..20" it will merge in revisions 10 to 20 of the other branch20:15
nysinHm. The error message I get from -r suggests that it's looking at the current branch20:15
james_wif you say "merge -r0..-1" then it will merge the two branches, whether or not they have a common ancestor.20:15
davidgeHi all20:16
nysin"$ bzr rebase --dry-run -v -r1021 ../dp/" is the command but when then I see "does not exist in branch: BzrBranch6('file:///home/nysin/mod/')"20:16
davidgeIs there a way to convert a dir-with-subtree repository to another (no subtree) format?20:16
james_wnysin: sorry, completely missed you were using rebase20:18
james_wdavidge: I'm not sure, it's theoretically possible to convert it to a rich-root repository if you have not used any subtree features.20:18
nysinjames, ah, okay.20:19
james_wnysin: in that case I'm not sure what the answer is I'm afraid.20:20
davidgejames_w: it's a plain repository without subtree features. But in practice, all 'bzr upgrade' commands fail with an error :(20:20
james_wdavidge: what's the error for bzr upgrade --rich-root-pack?20:21
davidgejames_w: bzr: ERROR: Cannot convert to format <RepositoryFormatKnitPack4>.  Does not support nested trees20:22
james_wdavidge: ok, it seems that it's not possible then.20:23
james_wdavidge: hopefully soon upgrading between formats in this way will become a lot smoother.20:23
davidgedavidge: you mean there is work in bazaar upcoming releases for that?20:24
davidgejames_w i mena :D20:24
james_wheh20:24
james_wI'm not sure it's exactly this case, but there has been a plan to make the converters much more friendly to this sort of thing.20:25
james_wI'm not sure whether it's in 1.520:25
davidgejames_w: i'm glad to hear that there is some of kind work for that...20:26
davidgejames_w: maybe i'll give a try to 1.5rc120:26
jamjames_w:  the way to go from -subtree => rich-root is via 'bzr init && bzr pull'20:27
james_wah, thanks jam20:27
jamit isn't *supposed* to work, but it does, and is the current workaround20:27
fullermdWell, that's encouraging   :p20:29
james_wjam: are you at UDS by any chance?20:31
davidgejam: hmm, thanks, i'll try that...20:31
jamjames_w: nope20:31
jamwhere is it this time?20:31
james_wah, shame.20:31
james_wPrague.20:31
=== mw|food is now known as mw
jamlifeless, poolie: The PQM seems to be unhappy with me. When I do 'pqm-submit' nothing shows up on https://pqm.bazaar-vcs.org/20:35
jamAnd I don't get an email about failure, either.20:36
=== kiko__ is now known as kiko
rick_h_anyone know how to use this now that the bug is fixed? https://bugs.edge.launchpad.net/bzr-svn/+bug/12076820:38
ubottuLaunchpad bug 120768 in bzr-svn "Should prompt for passwords" [Low,Fix released]20:38
rick_h_I'm not seeing any docs on how to force the password on first push20:39
james_whi ricardokirkner20:39
james_whi rick_h_20:39
rick_h_hey james_w20:39
ricardokirknerhi james_w20:40
james_wrick_h_: do you have subversion 1.5 installed?20:40
vadi2Is it possible to get an output similar to "bzr log" on a web server not hosting the bzr repository? The server that is hosting has loggerhead installed, but that only gives a web interface to it.20:41
rick_h_james_w: oops, got me. I assumed hardy had 1.520:41
rick_h_shoot, ok thanks20:41
james_wrick_h_: nope, I don't think 1.5 is out yet.20:41
james_wvadi2: bzr log will work against remote branches, is that what you want?20:42
jamrick_h_: hardy has 1.3.1, IIRC20:42
jamI'm putting together 1.5rc1 today20:42
jam1.4 final was just released last thursday20:42
vadi2james_w: i'm afraid the server doesn't have and can't have bzr on it20:42
rick_h_james_w: well I'm just getting started with bzr and trying to demo bzr-svn for a lightning talk20:42
jamIt is available in the launchpad ppa20:42
rick_h_I checked out a public svn repo, but wanted to demo push, which required auth20:42
rick_h_hmm, dpkg -l lists 1.4.6 for svn20:42
rick_h_in default hardy20:42
james_wjam: svn 1.5, it has bzr 1.3.1, yes.20:43
jamah, wrong version, you are talking svn. sorry for the noise20:43
rick_h_in my normal work case the branch required auth so it worked fine, but didn't want to demo with the work's stuff20:43
james_wrick_h_: I believe the old way to do it was to make the svn client auth, as this was cached and bzr-svn could use it, did you try that?20:44
LaserJockwhat do you call the .bzr/ directory? I'm trying to refer to that as opposed to the entire branch/working tree20:44
jamjames_w: dpkg -l lists 1.4.6dfsg1-2ub here20:44
james_wvadi2: I'm not sure then, sorry.20:45
jamLaserJock: the Bazaar control directory20:45
rick_h_james_w: not sure how to set up the svn client to auth since there's no .svn there.20:45
rick_h_it was a straight branch from the svn repo20:45
LaserJockjam: would that work as a DVCS generic term?20:45
LaserJock"control directory" I mean20:45
vadi2james_w: alright no problem.20:45
james_wrick_h_: an "svn ls http://wherever" doesn't require authentication20:45
james_w?20:45
jamLaserJock: well other ones would generally call it something different, but IMO it is still a control directory20:45
jama lot of them call it a "repository" which doesn't match Bazaar/SVN/CVS terminology20:46
LaserJockI'll just use control directory, I think people will get it20:46
rick_h_james_w: no, ls does not require auth.20:47
rick_h_public access to pull, need perms to commit20:47
james_wrick_h_: I'm not sure then, sorry. I don't know where the auth is cached, so another svn checkout to commit may do it.20:47
rick_h_cool, no problem. just for a demo so no worries20:48
james_wrick_h_: or if you have one lying around you could perhaps try and find the credentials.20:48
rick_h_it's coming is the asnwer I can give for now20:48
jamlifeless, poolie: unping, it is probably PEBKAC, I think I was leaving --dry-run on ...20:48
=== bimberi_ is now known as bimberi
jelmerrick_h_: hi22:26
=== mw is now known as mw|out

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