[BUG] Merging repositories with a directory deleted

John Eckerdal john.eckerdal at gmail.com
Wed Sep 14 12:49:48 BST 2005


Hi,

have been testing/using bzr now for a little while (bzr version
0.0.7). This has worked
nice until I recently.

The scenario I tested was as follows:

1. Create a repository (call it t1)
2. Add a directory with a file in it and a file in the "root".
  t1/dir/file1.txt
  t1/file2.txt
3. Branch the repository to (for example t2) bzr branch t1 t2
4. In the t2 branch delete the directory dir and file1.
5. Modify file1.txt in t1
6. I added a file in t2 (call it file3.txt)
7. Merge the repositories (in t2: bzr merge ../t1)

This causes an error:
bzr: ERROR: The file dir/file1.txt was modified, but does not exist in this tree
  at /usr/lib64/python2.4/site-packages/bzrlib/changeset.py line 1063,
in missing_for_merge()
  see ~/.bzr.log for debug information

Is this solved in the development version of bzr?

--
John Eckerdal




More information about the bazaar mailing list