Update with uncommitted changes?

John Arbash Meinel john at arbash-meinel.com
Wed Jan 23 22:26:40 GMT 2008


Matthew D. Fuller wrote:
> I was somewhat surprised to find out that 'update'ing a checkout with
> local commits and uncommitted changes goes ahead and does the pending
> merge conversion.  ISTM that it should complain and require forcing,
> just like merge requires sweet-talking to merge into a tree with
> uncommitted changes.  Is this an explicit choice, or just fallout from
> how it was written?

Well, one of the primary ways that you would use 'update' is on a 
mainline which you are tracking exactly (no local commits). In which 
case it would be odd to always have to supply --force.

I could see requiring "--force" if there were local commits, though.

John
=:->




More information about the bazaar mailing list