[issue111] allow "safe" merges into working directories with uncommitted changes
Brendan Cully
brendan at kublai.com
Mon Jan 30 20:49:16 UTC 2006
On Monday, 30 January 2006 at 08:55, Thomas Arendsen Hein wrote:
> * Brendan Cully <brendan at kublai.com> [20060130 05:16]:
> > I just installed 0.8 and played with this a bit. What I found:
> > 1. You can update under a repo with uncommitted changes if you have done
> > no local commits since the last pull.
>
> Correct.
> ...
> The canonical way would be to clone your repo, merge there, then
> pull the merge changeset from that repo.
One additional data point: I tried this technique (cloning, merging in
the clone, pulling from the clone and updating). If you have
uncommitted changes in a file that was also touched upstream, the
result is upstream's changes are mixed in with your own when you run
hg diff. Presumably this also happens in the regular hg update case
when you don't have to do a merge first. It seems like it would be
better if the upstream changes to the modified file were committed, so
that diff before and after update produces the same results (modulo
line offsets).
More information about the Mercurial
mailing list