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