bzr merge usability tweakage

[William Dodé]

On 27-05-2005, Aaron Bentley wrote:
> This is a multi-part message in MIME format.
> --------------030908040902090603020407
> Content-Type: text/plain; charset=ISO-8859-1
> Content-Transfer-Encoding: 7bit
>
>
> As promised, I've updated merge to refuse to operate when uncomitted
> changes are present in the tree.  I actually had a use case for that,
> reverting local changes using 'bzr merge ./@ .', so I've introduced a
> 'revert' command to restore the functionality I'd otherwise lose.

What do you think about an option to can keep the
changes somewhere when we revert ?
bzr revert --keep my.patch

>
> I've also introduced some basic messages that are spewed when conflicts
> are encountered.  I should note that this is in no way the final word on
> conflict handling.  In particular, I'd like something like bazaar's
> conflict/resolved handling.  But I'm still just throwing exceptions when
> you try to delete a non-empty directory, for example.
>
> Enjoy!

we do :-)
-- 
William Dodé - http://flibuste.net