wierd merge bug

[Erik Bågfors]

2006/3/9, Robert Collins <robertc at robertcollins.net>:
> On Thu, 2006-03-09 at 21:48 +0100, Erik Bågfors wrote:
> > Hi
> >
> > I have the following situation.
> >
> > I have a two branches (that have a common history), both have added a
> > file named "foo"
> >
> > When I merge one branch into the other, I get a message
> > bzr: WARNING: Conflict adding file path/to/foo.  Moved existing file
> > to path/to/foo.moved.
>
> Does foo have the same id in both ? (bzr file-id foo)
>
> > This is all fine, except the file path/to/foo doesn't exist anymore.
> > path/to/foo.moved exists, but not path/to/foo.
> >
> > This is 100% reproducable with my branches, but I can't manage to
> > reproduce it with any other branches.  The problem is that the
> > branches I have here, is not something I can give to anyone.
> >
> > I have tried to see if I can try to debug the problem myself and
> > reproduce with some other branches, in some way but I have not
> > succeeded yet.
> >
> > If I look in the file in .bzr/inventory before the merge, both
> > branches have the file (but with two different file_id's of course),
> > but after the merge, only foo.moved has an entry in .bzr/inventory in
> > the target branch.
> >
> > This is really annoying (and severe) and I can't seem to reproduce it
> > *gaaaaahhhh*
> >
> > Any hints?
>
> does:
> bzr init
> bzr branch . ../sibling
> bzr commit -m 'diverge'

the line above will not do anything since there is no changes, shall I
add a file before??

> touch foo && bzr add foo
> bzr commit -m 'add foo 1'
> cd ../sibling
> bzr commit -m 'more divergence'
> touch foo && bzr add foo
> bzr commit -m 'add foo 2'
> cd -
> bzr merge ../sibling
>
> reproduce it ?
>

No,

bzr: ERROR: Branches have no common ancestor, and no base revision specified.

/Erik