It is possible for another user to commit a revision between the beginning and end of a commit from bzr-svn. This leads to the bzr:base-revision property being set incorrectly, the interleaving revision being invisible to bzr clients, and a mangled tree.
For example, I have a checkout of a Subversion branch, from which I made a topic branch and modified a file. I merged the topic branch into my checkout, and ran 'bzr ci -m "blah blah blah"'. Before my commit completed, my co-worker commited a change to another file in the same Subversion branch using svn. His commit completes first and is revision x, mine completes immediately afterwards and is revision x+1. However, my commit x+1 has it's bzr:base-revision property set to x-1 rather than x. Subversion revision x doesn't appear in the output from bzr log, and the revision's changes are not reflected in the tree.
Manually tweaking bzr:base-revision fixes this for branches I make in new repositories, but how can I fix the branches in my existing repository?
On Tue, 2010-02-02 at 04:31 +0000, Huw Giddens wrote:
> Public bug reported:
>
> It is possible for another user to commit a revision between the
> beginning and end of a commit from bzr-svn. This leads to the bzr:base-
> revision property being set incorrectly, the interleaving revision being
> invisible to bzr clients, and a mangled tree.
>
> For example, I have a checkout of a Subversion branch, from which I made
> a topic branch and modified a file. I merged the topic branch into my
> checkout, and ran 'bzr ci -m "blah blah blah"'. Before my commit
> completed, my co-worker commited a change to another file in the same
> Subversion branch using svn. His commit completes first and is revision
> x, mine completes immediately afterwards and is revision x+1. However,
> my commit x+1 has it's bzr:base-revision property set to x-1 rather than
> x. Subversion revision x doesn't appear in the output from bzr log, and
> the revision's changes are not reflected in the tree.
Does revision x appear in the svn log output ?
Cheers,
Jelmer