bzr update merges changes even with uncommitted changes

Marius Kruger amanic at gmail.com
Thu Dec 11 14:46:29 GMT 2008


hi,

This is the the third time today I've seen `bzr update` do a merge where
there
has been not-yet-committed changes in my working tree (different times,
different places!).
This is bad, it messes up my working tree
so that I don't know what is new changes and what is part of the pending
merges.
AFAIK, `bzr merge` refuses to run if you have uncommitted changes (or you
--force it).

I don't know if I or others have complained about it in the past.
Can I/we change it to work like merge?

regards
marius
--
1ce ok, 2ce ok, 3rd time rant!
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20081211/c764381d/attachment.htm 


More information about the bazaar mailing list