With TreeTransform bzr revert after uncommit causes conflicts with reverted files.

[Aaron Bentley]

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

John A Meinel wrote:
> I haven't tracked down the exact cause yet, but I just had this happen:
> $ bzr revert
> bzr: WARNING: Conflict adding file rsync_update.py~.  Moved existing
> file to rsync_update.py~.moved.
> 
> 
> These are files which weren't modified in the mean time.
> 
> I'm not sure what the specific problem is. It looks like the file was
> reverted 2 times, the first one creating a backup, and the second one
> causing it to create ~.moved.

You already had a rsync_update.py~, and then you created a new backup by
reverting, which renamed the existing one.

> I realize maybe the TreeTransform code is more 'correct', but it seems
> to me like it should be okay to overwrite the backup files.

The old merge code used to overwrite them, it's true.  I'm not sure if
that jibes with keeping backup files in the first place.  Of course, I'd
rather not keep backup files...

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

iD8DBQFD+5hK0F+nu1YWqI0RAlEBAJ4iRARzZx4driKp5TSCBVGCoUAnbACdFcGW
br+SZ4vxLfc20CSgmOC+/tY=
=eyYB
-----END PGP SIGNATURE-----