[MERGE/RFC] Warn the user when updating with local commits, uncommited changes, and master branch changes (#113809)

[David Timothy Strauss]

The infamous double merge issue (#113809) occurs when a user has a checkout that is out of date with the master branch and the checkout has both uncommitted changes and local commits. When you update (as instructed by the error you get from commit in such circumstances), Bazaar performs two merges and introduces frustrating, spurious conflicts. Numerous users have lost faith in local commits, if not Bazaar entirely, from encountering this error and having to clean up.

At least for now, the best thing we can do is prevent users from encountering this problem and suggesting a sensible workaround. This patch looks for the circumstances described above. If a user updates under such circumstances, the patch throws an exception and tells the user to locally commit the changes and try again.

David Strauss
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 113809.merge
Type: application/octet-stream
Size: 4615 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081213/66d78de4/attachment.obj