[02:50] Hey [02:50] I've been using bzr-svn [02:51] on the SVN repository on svn.twistedmatrix.com [02:51] any time I do a 'pull' on any branch where I've done a 'push' though, I get a [02:51] Conflicting tags: [02:51] release-2.0.0+win32installer [02:52] can anyone help me out with an explanation of why that particular tag is always conflicting, and/or what I can do to fix it? I don't really care about tags at all, I'm just using bzr-svn for offline commits. [03:00] glyph: pull --overwrite [04:19] how do I include the changelogs of the merged revisions into the new branch? [04:52] micahg: changelogs? [04:52] glyph: sorry, commit messages :) (packaging on the brain) [04:53] micahg: that's just what happens when you branch in bzr [04:53] micahg: have you done 'bzr visualize' or 'bzr qlog'? [04:53] glyph: no\ [04:54] glyph: I wanted them merged for the merge commit message [04:55] micahg: you want all of the commit messages in the branch to show up as one *giant* commit message for the merge revision? [04:56] glyph: no, just the revisions that are being merged in [04:56] * micahg thought there was a flag [04:59] I don't know if there's a flag [04:59] but there's no reason to do that [04:59] since you can always access the earlier commit messages in the revision log === Adys_ is now known as Adys [09:36] I have a branch foo to which I added subtree bar. Then I did some commits on foo/bar (and nothing on the rest of the tree). Now I want to put bar into its own branch, keeping just the history starting from when it was added. [09:37] bzr split seems to copy the whole history. I found https://answers.launchpad.net/bzr/+question/106791, but it looks like bzr-rewrite hasn't been updated in a while and doesn't work with bzr 2.x. Any solution for this? [19:21] moin moin === Adys_ is now known as Adys [19:50] lifeless: ahoyhoy === Adys_ is now known as Adys