bzr merge fails if deleted contents differ

[John A Meinel]

John A Meinel wrote:
> I realize this is probably just a place where Aaron didn't know what the 
> correct method was, but I'm trying to merge my Transport code into the 
> bzr.newformat codebase. And when I did so, it did maybe 90% of the work, 
> and then raised an exception because I had deleted the "remotebranch.py" 
> file, which had been changed in bzr.newformat.
> 
> I don't really know what the best solution is. Perhaps just rename 
> "file.txt" to "file.txt.THIS". But still leave it as deleted.
> 
> My biggest problem is that I don't know what it did and didn't merge. 
> I'm slowly finding different things that it missed. Mostly it didn't add 
> newly added files, and so I have to copy them, and their inventory 
> entries manually.
> 
> John
> =:->


Just to add a specific test case (which could be added to the test suite 
in the future)

$ mkdir a
$ cd a/
$ bzr init
$ echo "hello" > a.txt
$ bzr add
bzr commit -added a.txt
$ bzr commit -m "added a"
added a.txt
$ cd ..
$ bzr branch a b
$ cd a
$ echo "there" >> a.txt
$ bzr commit -m "Added there"
modified a.txt
$ rm a.txt
$ bzr commit -m "Removed a.txt"
deleted a.txt
$ cd ..
$ cd b
$ echo something >> a.txt
$ bzr commit -m "Modified a.txt"
modified a.txt
$ bzr merge ../a/
bzr: ERROR: Contents mismatch deleting /home/jameinel/dev/,tmp/b/./a.txt
   at /home/jameinel/dev/bzr/bzr.dev/bzrlib/changeset.py line 1033, in 
wrong_old_contents()
   see ~/.bzr.log for debug information


Sorry it is a little long, but I think it covers everything.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 253 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20050928/9ca79a88/attachment.pgp