Re: aborting update spanning branches!

Matt Mackall wrote:     [Thu Jul 28 2005, 12:18:51PM EDT]
> hg update works like cvs update. The normal usage is to sync your
> working directory with tip.

"cvs update -r tag" does not require -C unless there are local
changes, even if there is no linear path between the revisions.

Matt Mackall wrote:     [Thu Jul 28 2005, 01:22:15PM EDT]
> The case in question didn't have the linear relation. I should
> probably expand the comment suggesting -m.. How about:
> 
>     self.ui.status("(use update -m to merge across branches" +
>                    " or -C to lose changes)\n")

I don't understand: There are no changes in the working files, so -C
shouldn't be necessary.  Equally, there are no changes to merge, so -m
shouldn't be necessary.

If it's required to use one flag or the other to change heads, then
it's too easy to *accidentally* delete or merge changes you forgot
about.  Personally, I want to be able to attempt to change heads, and
have mercurial simply complete the operation if there are no working
changes, and likewise fail the operation if there are working changes.

Perhaps the problem is that I don't understand the need for a linear
path?

Regards,
Aron