"bzr revert" leaves a mess

Robey Pointer robey at lag.net
Wed Feb 22 17:44:14 GMT 2006


Last night, I ran into a merge conflict and I was trying to get more  
debugging info out of it for Aaron, so I did:

$ bzr uncommit
$ bzr revert

and tried the merge again.  This time, of course, I got dozens of  
conflicts, though I didn't know why at the time.  Turns out that "bzr  
revert" leaves behind any files created by the merge, as well as  
creating a bunch of new *~ and *.moved files (and folders!).

I can understand the motivation ("bzr revert" used to erase newly- 
added files, which was much worse) but I think we should do one of:

1. When reverting a "merge" operation, erase added files.

2. Make an option "bzr revert --clean" which removes added files.

robey





More information about the bazaar mailing list