[13:22] <icehi> hi.  in bazaar, is there a way of removing, say, the top three changesets from my repository, and applying the changes to my working directory?
[13:25] <vila> icehi: s/repository/trunk, master branch, shared branch, remote branch/: yes
[13:27] <vila> icehi: if you start with your working tree its parent branch pointing at the same revisions, 'bzr merge -r-4..-1' should give you just that
[13:27] <vila> icehi: tri it and look at 'bzr st' and 'bzr diff' to check
[13:28] <vila> icehi: 'bzr revert' to cancel the attempted merge
[13:28] <vila> icehi: alternatively, use 'merge --preview' if you don't want the changes to be applied to your working tree
[13:30] <icehi> does that actually delete the changesets from the repository?
[13:30] <icehi> i want to use commits as temporary patches, apply them all to my working dir, and delete them from the log
[13:30] <vila> icehi: no changes are ever deleted from a repository, in bzr lingo, a repo is just a place you put changes
[13:30] <vila> icehi: what matters is the branch history and whether these revisions are part of it ir not
[13:31] <icehi> i'm basically looking for a way to 'shelve' changes temporarily
[13:31] <vila> icehi: 'bzr shelve --help' ?
[13:31] <vila> but shelves apply only to uncommitted changes
[13:33] <vila> icehi: 'bzr log' (or 'bzr qlog', its graphical equivalent) shows the branch history
[13:33] <icehi> can i shelve multiple changesets in bzr?
[13:33] <icehi> or is it just a single patch
[13:34] <vila> shelves are not part of the branch history, they are changesets what were never committed to any branch, so they don't appear in any branch history
[13:34] <vila> but you can have as many shelves as you want in a working tree
[13:35] <icehi> okay, i might give bzr a try
[13:35] <icehi> i use hg right now, but there is no simple way of shelving/unshelving in hg at the moment
[13:36] <vila> icehi: you're welcome ;)
[13:38] <vila> icehi: check http://wiki.bazaar.canonical.com/MatthewFuller/SpotDocs/PiecesInBrief , it's a good Rosetta stone for refugees (it's a wiki)
[13:47] <icehi> thanks.  does bzr support git-diff format?
[14:05] <jelmer> icehi: if you have the bzr-git plugin installed you can use "bzr diff --git"
[14:05] <jelmer> sorry, "bzr diff --format=git"
[14:09] <icehi> thanks
[16:10] <idnar> bleh, is there any way to have ~/.bazaar/locations.conf override everything?
[16:10] <idnar> err
[16:10] <idnar> *not* override everything
[19:03] <meoblast001> hi, i'm a little confused
[19:03] <meoblast001> i have a .bzrignore in the root of my project, but it only lists things to ignore in the root directory
[19:04] <meoblast001> there is no .bzrignore in other directories
[19:04] <meoblast001> yet, it seems it's ignoring the files i told it to ignore in those directories
[19:04] <meoblast001> if these ignores are not in the root .bzrignore file, will they be ignored for others too?
[19:33] <jelmer> meoblast001: hi
[19:33] <meoblast001> hi jelmer
[19:33] <jelmer> idnar: I don't think there is a way to do that at the moment; the idea is that locations.conf can be used to override per-branch behaviour (e.g. for remote branches)
[19:34] <jelmer> idnar: Vincent's config improvements might help with that, though you'd probably have to ask him.. I'm not sure about the details
[19:35] <jelmer> medberry: I'm not sure if I follow, .bzrignore can only be in the root of the tree
[19:35] <meoblast001> jelmer: well, it doesn't contain the files i want to ignore within subdirectories
[19:36] <meoblast001> can i just add *.pyc to bzrignore?
[19:36] <meoblast001> and it ignore all pyc files in the entire project
[19:36] <jelmer> meoblast001: yes, if you just add *.pyc it will ignore them everywhere
[19:36] <jelmer> although I believe *.pyc is already in the global bzr ignore file
[19:37] <meoblast001> ah, thanks :)
[23:52] <AuroraBorealis> so, if you have a shared repository within another shared repository, it stores all the stuff in the top most repository?
[23:52] <AuroraBorealis> cause it seems that way based on my old branches but it says nothing about it in the docs :o
[23:52] <jelmer> AuroraBorealis: it uses the first shared repository it finds when browsing up the directory stack
[23:53] <AuroraBorealis> it appears to be going up two repos
[23:53] <AuroraBorealis> cause i had like java/class1/trunk, and class1 and java are repos, and it seems to be storing stuff in 'java'
[23:53] <AuroraBorealis> according to the nice new branch location information
[23:54] <AuroraBorealis> or maybe i'm wrong cause this is on my server, hmm
[23:57] <AuroraBorealis> no i'm just being silly. you seem to be right =P