/srv/irclogs.ubuntu.com/2007/11/06/#bzr.txt

somerville32bye00:40
=== mw is now known as mw|out
nekohayohello~! let's say I want to push to another computer, but this computer's files can change by themselves00:59
nekohayowill bazaar warn me of a conflict if the host has changed it files since the last push?01:00
fullermdDepends on which files you mean.  push only pushes the VCS data, it doesn't touch the working tree files one way or another.01:01
fullermdIt'll notice if the remote-side VCS data has been changed.01:01
somerville32aka: It compares committed revisions01:04
nekohayofullermd: ok thanks :) (because I just had the crazy idea of using bazaar to keep my bookmarks in synch)01:08
nekohayofullermd: actually by vcs data, you mean stuff like "bookmarks.rdf", not the control data contained in ".bzr" right?01:09
fullermdOther way around.01:09
nekohayoarr, dang :|01:09
somerville32nekohayo, No no. You're good.01:15
somerville32Bzr is great for that01:15
nekohayosomerville32: well, if I have my laptop pushing to ~/.gnome2/epiphany/bookmarks.rdf on my desktop computer, and the desktop computer has modified its bookmarks file (without committing or anything) since then, am I not screwed?01:16
somerville32nekohayo, No.01:16
somerville32It'll merge when you attempt to commit on the desktop01:17
fullermdNot necessarily.  But it won't touch the desktop's bookmarks.rdf, it'll just update the VCS data.  You'd have to do an 'update' to bring in those changes, fix any conflicts, and then 'commit' to get the desktop's changes in the history.01:17
nekohayofullermd: that's strange, that I need to do a bzr update... why wouldn't bzr just tell when I commit?01:19
fullermdWell, if will, if you don't update   :p01:20
fullermdAnd 'it', too, for those of us who can type tonite...01:20
poolie_lifeless, jam-laptop: hi03:27
jam-laptophi poolie_03:27
poolie_should we merge this windows uninstaller fix for 0.92?03:27
poolie_it doesn't seem really critical...03:27
lifelesshi poolie_03:29
jam-laptopit doesn't seem critical either way03:32
lifelessOTOH it's low risk and alecander will probably build with it applied anyway :)03:41
ubotuNew bug: #72901 in bzr-pqm "win32: can't submit via localhost" [Low,Fix released] https://launchpad.net/bugs/7290103:56
ubotuNew bug: #160389 in bzr "change build process to (just) use setup.py" [Undecided,New] https://launchpad.net/bugs/16038904:25
lifelessman freenode, get the servers in order04:38
jam-laptop_that was probably just them running sort()04:38
=== Verterok is now known as Verterok_
=== Verterok_ is now known as Verterok
=== elmo_ is now known as elmo
Odd_BlokeDoes a list admin have to approve my subscription to the ML?05:43
fullermdNot as a general rule, AFAIK.05:45
Odd_BlokeHmm, just sloooowness then.05:46
=== Verterok is now known as Verterok_
vilajam-laptop__: since you're working on pqm, how about putting the commit message in the returned email indicating success/failure ?06:28
Odd_BlokeIf any of the list moderators are around, there should be a couple of merge requests from D.M.Watkins@warwick.ac.uk in the pending queue.  It'd be great if they could be let through and the address whitelisted. :)08:51
datoaw pqm (r2972)11:02
EnquestI got a foo.BASE, foo.THIS, foo.OTHER files... What should i do now?11:58
ArjenMerge error?11:58
EnquestUhm I use bzr to upload it to my web project11:59
EnquestI suppose that its a merge error12:00
EnquestWhat should I do with it... I can't find anything about it in the docs12:00
ArjenI'm a complete bzr noob :-)12:00
Enquestme to12:01
Enquestso anybody can explain me what I sould do with this?12:01
ArjenEnquest: What does 'bzr conflicts' say?12:08
EnquestI already did it manualy but I realy would like to know how to handle these errors12:09
Enquestthanxs Arjen (you are from holland?12:09
ArjenYup12:09
EnquestBelgie of moet ik zeggen Vlaanderen ik weet het niet meer12:09
ArjenWell, merge conflicts which can't be handled by the VCS you'll have to fix by hand12:10
ArjenEnquest: Nederland, niet Belgie :-)12:10
Enquestaja, lage landen12:10
EnquestWerk jij proffesioneel?12:10
ArjenDat probeer ik wel ;-)12:11
EnquestIk ook, met wat werk jij dan? zelfstandige of voor een bedrijf?12:12
EnquestIk ben zelfstandige12:12
ArjenInternetprovider12:12
Enquesta je programmeert niet... maar heb een isp12:13
ArjenJa, ik programmeer voor een ISP12:13
Enquestverdiend dat wat?12:14
ArjenGenoe12:14
Arjeng12:14
ArjenBut, this conversation is *way* off-topic here :-)12:15
EnquestOk got the point... Just thought that its here dead and want to know how people manage ?12:15
Enquestsorry12:15
ArjenMerge conflicts you mean?12:16
Enquestyes12:16
ArjenIf the VCS can't figure it out, then you'll have to fix the conflict(s) yourself and tell the VCS to continue12:17
Odd_BlokeArjen, Enquest: It's not normally this dead in here, but the majority of bzr devs are Canonical employees and it's Ubuntu conference season so they're gallivanting away there. :p12:28
Kinnison:-)12:29
Odd_BlokeEnquest: Presumably you ran 'bzr merge' before getting these files.  These files mean that there was a conflict within foo that Bazaar can't handle.  If you open foo, you should see some markers where the problem is.  Edit foo so it looks as it should and then run 'bzr resolve foo'.12:30
jam-laptop__vila: that requires pqm changes, not changes to the submit plugin :)12:57
vilajam-laptop__: arf, of course silly me |-)12:57
=== jam-laptop__ is now known as jam-laptop
vilabut about pqm anyway, I'm still surprised that we sign a submission to merge from an url, but don't provide the revid that should be merged, leaving open a possible tip change of the submitted branch...12:59
jam-laptopvila: completely agreed, it is actually because pqm was built up around Bazaar, which would always send the full archive/category--branch--version--patch13:00
jam-laptopAnd it was never upgraded to recognize something different from bzr13:00
jam-laptopI actually started working on that once.... a long time ago13:00
vilahaaaaa, history, as always. explain why things me *look* strange, but are, in fact, sound :)13:01
vilas/me/may/13:01
jam-laptopanyway, I'm off to breakfast, catch you around later13:01
vilasame here, very busy thought :-/13:01
lifelessola!13:07
lifelesswell in principle pqm accepts url;revid=XXX13:08
lifelessexcept I don't think I've hooked that in13:08
vilawell, I'm not that worried about the problem since only core devs can submit, but I wondered13:14
lifeless(and arch suffers here too ;)13:17
lifeless(you can replace the content of a url is the basic attack)13:17
=== bigdo1 is now known as bigdog_
=== mw|out is now known as mw
siretartheyha bazaar hackers15:38
siretartis it possible to recreate the knit index file from a standalone knit?15:38
siretartread: I have the revisions.knit, and need to regenerate a revisions.kndx file15:39
datoabentley: I can't see in bzrtool's branch the commits for 0.92, is something wrong?15:40
lukssiretart, not easily, maybe in some simple cases and using heurestics15:41
luksbut .knit files don't have all the info from .kndx stored in any direct way15:42
siretartluks: I have a corrupted repository, my revisions.knit seems to be corrupted15:42
siretartzcat on revisions.knit tells me something about trailing garbage, and bzr is horribly unhappy15:43
lukshm15:45
siretartI can of course rezip the output of the corrupted revisions.knit, but then the kndx file doesn't match it :/15:45
siretartand `bzr check` doesn't seem to catch that problem15:46
luksdoes zcat lists the last revision info fully?15:46
siretartI cannot check what the last revision actually is15:46
LeoNerdBe aware you can't just re-compress the compressed files. They're compressed in a very special way15:46
lukslast line in the .kndx file15:46
luksit has the revision-id15:47
siretarthm. the last 6 revisions seem to be missing15:47
siretartbetter than nothing15:47
siretartlets try to 'adjust' the .kndx file :)15:47
luksyeah, that should work15:47
siretarthm. bzr log now tells me 'no such revision.. blabla'15:49
siretartseems i need to do some more work15:49
luks/bzr/checkout/last-revision I think15:50
lukser, .bzr15:50
luksok, no, branch/last-revision15:51
datoor revision-history for format 5 branches15:52
siretarthm. and if I remove .bzr/checkout, can I recheckout?15:52
luksno15:52
luksit needs to know the head revision15:52
luksactually, maybe you can branch -r revid:...15:52
siretartah, lets try that15:53
siretartbzr: ERROR: bzrlib.errors.ShortReadvError: readv() read 9636 bytes rather than 19321 bytes at 0 for "revisions.knit"15:54
lukscan't help with this one, not sure that exactly is bzrlib doing15:55
siretartanyway, thanks for your help15:55
luksI'd send a mail to the mailing list15:56
siretartit seems my repository is horribly corrupted :(15:58
lifelesssiretart: sure it wasn't a network problem?15:59
lifelesssiretart: OTOH if you were pushing over sftp, it may be the sftp bug we haven't tracked down with openssh doing the wrong thing on append from time tot time... pretty nasty16:00
=== abentle1 is now known as abentley
=== spiv_ is now known as spiv
lifelessjam-laptop: you've arranged to borrow the laptop?16:36
jam-laptoplifeless: yes, he said he would give it to me later today16:36
lifelesskk16:36
jam-laptopit was currently charging in his romo16:36
jam-laptoproom16:36
siretartlifeless: no, all operations were local. (well, over nfs, but still using the file:// transport)16:38
siretartlifeless: I've been told now by the student that he noticed that committing still works, so he committed about 6 additional revisions16:39
lifelesssiretart: so, run check :)16:40
lifelesssiretart: if it's corrupt you'll probably be able to pukll from it to a backup copy to combine the work.16:40
lifelesssiretart: getting to a root cause of this is very important; its possible for an NFS bug to damage things -16:40
siretartlifeless: check tells the same error16:41
lifelesssiretart: when append() on fileA works, append() to file B works, but actually only file B's change gets committed over the wire it could cause this.16:41
siretartlifeless: we now decided to copy the working copy over an older repository16:41
lifelesssiretart: also, using packs may be somewhat less liable to cause this sort of corruption as it has less requirements on the file system.16:41
siretartso we haven't lost any work, but some weeks of history16:41
siretartah, great news!16:42
ubotuNew bug: #160521 in bzr "specific merge algorithm for changelogs" [Medium,Confirmed] https://launchpad.net/bugs/16052116:51
=== abentle1 is now known as abentley
lifelessjam-laptop: I'm in the hearth and kettle17:21
jam-laptoplifeless: is it hot in there?17:23
ubotuNew bug: #160530 in bzr-pqm "pqm-submit is sending messages pqm doesn't understand" [Critical,Fix released] https://launchpad.net/bugs/16053017:31
lifelessjam-laptop: no17:41
lifelessjam-laptop: nor is it cold17:41
Odd_Blokelifeless: Regarding my bundles, should I resend them with an appropriate MIME type?18:06
lifelessjam-laptop: the laptop is with me in the h&K18:09
jam-laptopah, ok18:09
lifelessOdd_Bloke: well, I can look on BB later; but next time18:09
Odd_Blokelifeless: OK, sure.18:10
Odd_BlokeSorry about that.  As my email mentions, I've changed mail client.18:11
schierbeckjelmer: ka-ping18:41
jelmerschierbeck, pong18:41
schierbecki'm not sure what the problem is with the brokenlines-optional branch18:42
schierbecki just destroy the current treeview and draw a new one18:42
schierbeckbut under all circumstances, we should support dynamically redrawing the ancestry graph18:42
schierbeckso i think it's a temporary solution18:43
jelmerre19:00
lifelesshi19:00
jelmerschierbeck: I don't think your patch is wrong, it may have regressed during gary's original rewrite19:01
jelmer'evening lifeless19:01
schierbeckjelmer: i just wrote it19:01
schierbecki can't find the real problem, but having a maximum width on the graph fixes it for now19:02
schierbeckand i don't think we're going to stick with the code, so it's okay to release19:02
jelmerI agree, though it's up to Szilveszter to decide19:04
jaavaaguruHi, I've got a delta between two revisions using rev_tree.changes_from(parent_tree), and I'd like to get the full text of particular files from both revisions to pipe into an external diff tool. Can someone point me in the right direction to get the full text?19:05
asabilhi all19:10
asabilhow do I use a pre-commit hook ?19:11
asabilI want to refuse commits with files with trailing spaces19:11
james_wjaavaaguru: I don't think you use the changes fr that , you get the texts from the two trees.19:12
jaavaaguruah, ok19:12
james_wtree.get_file_text19:12
jaavaaguruthanks :-)19:13
james_wtakes an id. You can get those with tree.path2id19:13
jaavaaguruI've got the IDs19:13
james_wgood.19:13
jaavaaguruI've been using the Bazaar API since Saturday, and working with it has been good so far19:14
jaavaaguruI've written most of my wxWidgets GUI, and am just needing to get the text so that I can launch an external diff from the history window19:15
nevansgeneral merging question: I did a series of merges of single changesets (e.g. using "bzr -merge ../trunk -r 1925..1926" to get r1926), but it didn't record that the changeset was merged.19:22
nevansand "bzr missing ../trunk" still shows them missing.19:22
nevansremerging ends up with a bunch of conflicts, of course.19:23
nevansshould I have done that differently?19:23
nevansFWIW: I was using bzr 0.91 and bzr-svn (using 0.92rc1 now)19:24
lifelessasabil: Hi, you write a small plugin19:25
lifelessasabil: it registers with Branch.commit_hooks['precommit'] IIRC19:25
jelmernevans: bzr doesn't track cherrypicks yet19:25
lifelessnevans: cherrypicking is a current weakness; we have a ui to express it but we don't record it(neither does hg or git FWIW)19:25
nevansjelmer: ah... I thought that was maybe what everyone meant by cherrypicks19:25
nevansgit doesn't either?! wow... so what's the current "best practice" for cherrypicks?19:26
nevanslifeless: what's the cherrypicking UI called?  google isn't helping me out much.  :)19:28
lifelessnevans: you used it19:29
nevansah.19:29
jaavaagurujames_w: that did exactly what I was looking for, thanks. I've got external graphical diff working now from my history window19:39
nevanslifeless: is http://www.kernel.org/pub/software/scm/git/docs/git-cherry-pick.html only a halfway solution?  (since you said git doesn't support it either)19:43
lifelessnevans: yes,19:57
lifelessnevans: cherry picks can be much more than one commit; they need to alter the behaviour of merge and log and other commands and the only system I know of that does that today is darcs.19:57
nevanslifeless: is there a bzr branch that someone is working on this currently?  or is it a little further out in the roadmap (not really specified yet)?20:00
jelmerlifeless: that reminds me, what's the status on file properties?20:00
nevansnot that I intend to switch to an experimental branch anytime soon.  ;)  just curious20:00
lifelessnevans: it's a little bit out in the roadmap; I think probably in the nexxt 6 months or so.20:02
nevanslifeless: thanks20:03
hendrixski:-/ bzr-svn is able to pull svn revisions rigth? from let's say a week ago?20:38
PengYes.20:39
jelmerhendrixski: from svn into bzr? yes20:39
hendrixskijelmer, like instead of    svn co http://whatever -revision #12345 (not sure how to do that either)  do make a branch of a revision from last week20:41
jelmeroh, sure - you can use -r20:42
hendrixskioh20:42
jelmerah, you mean revspecs of dates?20:43
jelmerhmm, that I'm not sure20:43
* hendrixski tries that20:43
jelmerit may work, but I haven't ever tested it20:43
hendrixskioh20:43
hendrixskiwell, I'll play around with it :-)20:43
nevansjelmer: is there a way to see/use the SVN changeset number rather than the various bzr revisionspecs?20:44
jelmernevans: the revision id for svn revisions contains the svn revno20:46
nevansit would be useful if there were a revspec like "svn:123456"20:46
* hendrixski now knows that the word to google for is "revisionspecs"20:47
jelmernevans: please file a bug report :-)20:47
nevansah... so it does.  bzr log --show-ids is useful20:47
nevansjelmer: I think I will.  :)20:47
nevansjelmer: oh, and as an aside... THANKS for bzr-svn.  it rocks.  :-)20:48
jelmerthanks :-)20:49
hendrixskiyeah.. I think bzr-svn is going to save me a ton of headaches in the near future20:50
hendrixskiif I can quickly learn how to use it :-/20:51
=== keir__ is now known as keir
hendrixskihhhmm... yeah, for bzr .90, the    bzr branch http://svn.source/directory date:2007-10-25    doesn't seem to work  I guess it has a different date structure than svn :-(20:57
nevanslaunchpad was giving me some weird timeout errors, so I didn't search to see if there was a duplicate before adding my bug.20:58
=== mw is now known as mw|food
nevanshendrixski: your problem is that you want to get working tree for a particular svn revision number, right?21:03
hendrixskinevans, yup21:03
hendrixskithough, I'm probably just putting them in the wrong order21:03
nevansyou do that by first doing a checkout of HEAD from svn, using that to figure out what the bzr revno will be, and then branch from the bzr HEAD to a new branch (using -r bzr_rev_number)21:04
nevansa little bit indirect.  but it should work21:05
nevansto quickly get the bzr revision-id, you could do "bzr log --show-id | grep 29853"21:06
* hendrixski is confused21:07
nevanssorry21:08
hendrixskinevans, not your fault... I'm a total noob21:08
nevansso you want to do "svn co http://whatever -r 12345"...21:08
nevanswhat you could do instead:21:08
nevansbzr co svn+http://whatever/trunk trunk21:09
hendrixskiright, so that's the head of trunk, right?21:10
nevansthen cd into trunk, and do "bzr log --show-id | grep 12345" to find out what the bzr revision id is21:10
nevansyep21:10
hendrixskiah21:10
hendrixskiok21:10
nevansthen, with the revid in hand:21:10
nevansbzr branch -r revid:svn-v3-trunk1:0487d25d-142b-0410-8fcf-b82ac621bf97:blahblahblah:12345 ../branched_from_1234521:11
hendrixskiah... Ok, because those things are more complex than just the revision number  I see21:11
* hendrixski is still waiting for head of trunk to download21:12
nevansBTW, it will go faster and use less disk space if you are using a shared-repository... but if you are just starting with bzr, you should probably wait until you are comfortable before you start working with that21:12
hendrixskiI'm totally just starting21:12
nevanshendrixski: yep.  and that is why I asked jelmer if there was a svn revisionspec.  :)21:12
hendrixskiah21:14
nevanspresumably, if there was, the entire ordeal could be shortened to just "bzr checkout svn+http://whatever -r svn:12345"21:14
hendrixskiin a perfect world I suppose21:15
hendrixskihah, whadya know... the revision numbers are totally different than what I see on trac21:15
hendrixskiI thought I was supposed to be getting revision # 1480? but it's only actually up to 10321:16
nevanshendrixski: same sort of issue21:16
hendrixskiyup21:16
hendrixskioh man, no manual would ever have shown me that...21:16
nevansbzr has quite a few ways of addressing a revision... none of them as simple as svn's "global" (per repo) changeset id21:17
nevansbzr help revisionspec21:17
hendrixskiyeah, knowing the word for it (revisionspec) helps a lot too :-p21:18
nevansin svn, the revno is global through the entire repository (all projects, branches, tags, etc).  in bzr, it is for just that branch.21:18
nevanshendrixski: the only way I know the word for it is "bzr help topics"  ;)21:18
ubotuNew bug: #160607 in bzr-eclipse "seting plugin path in bzr settings breaks bzr support" [Undecided,New] https://launchpad.net/bugs/16060721:20
hendrixskihhmm... bzr branch -r revid:102 ../New/21:24
hendrixskibzr: ERROR: Not a branch: /home/******/Desktop/officialBranch/New/21:24
* hendrixski will figure this out :-)~21:25
nevanshmm... I had it wrong... you need to give it both to and from URLs (or just a from)21:26
nevansbzr branch FROM TO -r 10221:26
nevansbzr branch -r revid:102 . ../New/21:26
fullermdYou almost certainly don't have any revisino with the revid 102...21:28
hendrixskinevans, you are THE MAN!!!!21:28
nevans:)21:28
* hendrixski does a little dance as the earlier revision downloads :-)21:28
* hendrixski is done dancing 21:30
hendrixskiSo then I guess the problem was that I assumed that the wrong thing was the actual revision number, I have to get the HEAD first, browse through which revisions exist, and *then* I get the right revision number and DL it21:30
hendrixskiwhich is what nevans said in the first line21:30
hendrixskibut I didn't understand it until after I tried it21:30
hendrixskisweet21:30
nevansyeah... revision numbers mean completely different things to svn and bzr21:30
hendrixskiI see21:31
=== mw|food is now known as mw
ubotuNew bug: #160626 in bzr "need to suppress upgrade warning" [Undecided,New] https://launchpad.net/bugs/16062622:40
jodalHi! We're having problems with a repository used with 0.17 (etch) and 0.90 (gutsy). seemingly randomly, we get KnitCorrupt errors at some commits, and also at checkout of the entire branch: http://dpaste.com/24408/23:03
jodalany tips?23:04
abentleydato: Those commits should be there now.23:16
lifelesshi abentley23:27
abentleyHi there.23:28
lifelesskindof a shame to be int he same TZ but so busy we don't get much time to chat23:28
lifelessspeaking of which, time to grab my jacket for dinner23:33

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