=== slank is now known as slank_away [03:06] someone removed my .rvmrc file from the repo ... once upon a time it was mainted in the repo [03:06] is there a way to restore the version in a given revno? === jlf` is now known as jlf [09:19] morning === LarstiQ_ is now known as LarstiQ [10:20] is there a tool to visualise the branching of several branches with same root? [10:22] launchpad has something like that on project pages iirc [10:38] you can run qlog in a shared repo and get multi-branch history, probably not quite what you want but can be handy [10:39] that's for only one branch though? [10:52] how would I go about traversing everything in a shared repository and creating a graphviz diagram for it? http://people.canonical.com/~mwh/bzrlibapi/bzrlib.repository.Repository.html#all_revision_ids returns an iterator over a http://people.canonical.com/~mwh/bzrlibapi/bzrlib.revision.html I assume... [10:54] ccxCZ: see the bzr branches command for reference, bzrlib/builtins.py cmd_branches [11:00] hmm, so far it seems simpler to postprocess the output of log --long --with-ids with awk instead of doing it using bzrlib === mmrazik is now known as mmrazik|lunch [11:44] ccxCZ: qlog can do multiple branches, `bzr qlog ~/branch1 ~/branch2` is an example from its help [11:57] neat, thanks === mmrazik|lunch is now known as mmrazik === slank_away is now known as slank === yofel_ is now known as yofel [16:08] hi, I'm doing bzr export new-folder mybranch and it's a pretty big directory, on which I run ./configure && make -- then when I make change to my branch, is there a way to update the exported folder without rewriting all the files there? [16:09] lduros: not sure, I'll note that bzr-upload does smarter sync, but if it's just for a local build dir that's probably not what you want [16:09] hmm, right yeh [16:10] mgz: I guess the easiest thing to do is to just copy those files manually [16:10] :-) [16:10] any particular reason you're not just using a lightweight checkout and using update say? [16:10] mgz: no, no reason, didn't think about it [16:10] mgz: i'm still learning bzr really [16:11] I'm trying to figure out what you mean by a lightweight checkout ;-) [16:11] well, some things match particular ways of doing stuff better, it's always a bit hard to see without trying and seeing what hurts :) [16:11] no local branch or repo [16:11] ok [16:11] hehe [16:11] lduros: *nod* -- lightweight checkouts are more like the traditional svn way of doing things [16:11] so, `bzr checkout --lightweight mybranch new-folder` [16:12] mgz: so I just do this: bzr checkout mybranch mylightweightco? [16:12] ah ok [16:12] nice :-) [16:12] alright, that should same me some time on the build :-) [16:13] as it's a real versioned thing linked to the branch, it can do more, but also possible to get in a bit of a muddle, provided you remember you can just ignore stuff in there if it's a scratch build folder you should be fine [16:13] right, ok :-) [16:13] mgz: thanks much for the lesson! [16:15] what I often do for build-intensive projects where I actually want to use feature branches is have a --no-trees repo with all the branches under it, then a 'tree' lightweight checkout I work in and switch between the branches, and other checkouts on demand [16:16] hmm, sounds like the way to go! [17:27] mgz: so once I have made changes to my branch, how do I bring them in my lightweight checkout. if I do bzr merge ../mybranch, it tells me the working tree has uncommitted changes [17:27] bzr update? [17:27] yeh looks like it [17:27] cool! [17:27] :-) [17:27] that's the one :) === deryck is now known as deryck[lunch] === deryck[lunch] is now known as deryck