attn: abentley Re: [BUG] Merging repositories with a directory deleted

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> On Wed, 2005-09-14 at 13:49 +0200, John Eckerdal wrote:
> 
>>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
> 
> 
> I encountered exactly this bug during testing of baz2bzr. I haven't
> looked closely yet.
> 
> Aaron - any chance you can have a peek?

NotABug.  What you're seeing is the default conflict handling, which is
easy to override.

What I really need is a comprehensive exception-handling spec.  So far,
I've just been handling each case as it bit people, based on vague ideas
of 'the right way'.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDKHKT0F+nu1YWqI0RArcaAJwM5UG5/axgXXUHPd8QXf/0loTJdgCfUgk8
d76PUBhOMjEKlxj7Gtm9qDk=
=MOsm
-----END PGP SIGNATURE-----