[00:48] <_habnabit> I'm kinda uncertain as to what a criss-cross merge is in bzr, and how to avoid them.
[00:48] <_habnabit> I have a star topology, like it describes, but I do frequent merges from trunk to the feature branches.
[00:48] <_habnabit> Is this something I should avoid, or approach in a different way?
[01:00] <mtaylor> getting zope tracebacks pushing new branch to launchpad...
[01:01] <mtaylor> _habnabit: criss-cross merge isn't necessarily bad
[01:01] <_habnabit> So I shouldn't worry about it?
[01:03] <lifeless> mtaylor: you just had a traceback ?
[01:03] <mtaylor> lifeless: yes
[01:03] <mtaylor> lifeless: http://paste.drizzle.org/show/165/
[01:04] <mtaylor> lifeless: oh - I see the status in #launchpad ... hrm
[01:15] <poolie> _habnabit, no, don't worry about it
[01:22] <_habnabit> Also, the documentation says that bzr svn-import is resumable, but it's not clear *how* you resume it.
[01:23] <poolie> i would assume you run it again with the same arguments?
[01:23] <_habnabit> Well. I did make changes to the working trees between invocations.
[01:23] <_habnabit> Maybe it's just that my changes were clobbered.
[01:27] <_habnabit> Okay here is my full problem. I'm trying to import a subversion repository into bzr, but I'm also trying to fix svnmerge.py fucking up.
[01:27] <_habnabit> We only *just* discovered that it's been behaving... oddly ever since we started using it, but it wasn't obvious until just now.
[01:28] <poolie> hm
[01:28] <poolie> i'm not sure but i suspect it will not notice changes you make in the wt
[01:28] <_habnabit> My first thought was to go through and replay the merges incrementally as I import from svn.
[01:29] <_habnabit> Is there a tool I'm just not aware of that tracks svn mergeinfo when importing into bzr?
[01:29] <_habnabit> I tried tailor and svn2bzr first, but they both choked in interesting and different ways.
[01:30] <poolie> i don't know, sorry - i suggest you ask on the list
[01:31] <_habnabit> man svn is so miserable. :(
[05:52] <_habnabit> Is there a way to transmit an entire shared repository over a network somehow?
[05:53] <_habnabit> I mean there seems to be no equivalent of pull or branch for shared repositories.
[05:56] <bob2> there's a couple of plugins
[05:56] <bob2> multi-pull in bzrtools
[05:56] <bob2> and repo-push
[05:56] <_habnabit> I tried multi-pull.
[05:56] <_habnabit> Oh.
[05:57] <_habnabit> repo-push seems to be what I want.
[11:11] <_habnabit> I'm trying to figure out what the best way to serve this repository is. My coworkers are stubborn windows users who would actively resist using something like pageant, so ssh isn't really an option.
[11:11] <_habnabit> Maybe just `bzr serve` ?
[11:29] <vila> _habnabit: 'bzr serve' is an option but you don't want to have it exposed outside of your intranet.
[11:29] <_habnabit> Is there anything else I'm forgetting?
[11:29] <_habnabit> Like, can bzr serve over webdav?
[11:29] <vila> _habnabit: ssh is really the preferred option these days and some documentation have been written recently specifically to make it easy for windows users
[11:30] <vila> _habnabit: oh, no, just bzr server is enough you don't need webdav at all
[11:30] <vila> s/server/serve/
[11:30] <_habnabit> Yeah, I know it's easy; I've set it up on my own windows box.
[11:30] <_habnabit> But my coworkers are terrible and I'm trying to incrementally make them less terrible.
[11:31] <vila> _habnabit: then it's better to *not* provide any file system level support
[11:31] <_habnabit> What do you mean?
[11:31] <vila> _habnabit: otherwise you will quickly get people trying to handle working trees on the server instead of just branches
[11:32] <_habnabit> Oh, well, yes. I'll be able to beat them into submission on those kinds of matters.
[11:32] <vila> and this open several can of worms you don't eant to deal with
[11:32] <vila> s/eant/want/
[11:38] <vila> _habnabit: https://code.launchpad.net/~adam-delvecchio/bzr/662448-sshkey-doc/+merge/38682 is what I was referring to
[11:39]  * _habnabit looks.
[11:39] <vila> _habnabit: feel free to add your feedback there, this is still worked on and you have the timely opportunity to explain how it helped with your co-workers (or not)
[18:22] <barjac> Hello - I simply need to checkout a branch and then keep it updated from time to time. I check out with :-
[18:22] <barjac> bzr branch http://bzr.savannah.gnu.org/r/grub/trunk/grub which creates ~/grub
[18:23] <lifeless> that gives you a new distinct branch - you can then use 'pull' to copy new revisions across to it
[18:23] <barjac> To update I use :- bzr update from within ~/grub but it says it is up to date at a revision way behind the server
[18:24] <barjac> What am I doing wrong?
[18:25] <barjac> lifeless: Ah! thanks I will try that - bzr man is a bit cryptic :-(
[18:27] <lifeless> :(
[18:27] <lifeless> hope it helps
[18:29] <barjac> lifeless: Yep that does it! Thanks for your speedy help :-)
[18:32] <lifeless> my pleasure
[22:12] <jderose> Bit disappointed people.canonical.com/~ianc has been removed. Does Ian's  Community-Agile Software Guidance essay have a new permanent home anywhere?
[22:13] <jderose> Pretty important part of Ian's legacy, IHMO