tell update to run only if there are no conflicts

[Lasse Kliemann]

Kastner Masilko, Friedrich <kastner-masilko at at.festo.com> writes:

>> So I would prefer:
>> 
>> hg pull
>> hg update --only-if-no-conflicts
>> hg commit
>> hg push -f

> What should happen between the second and third line when a conflict
> arises? Auto-commit and merge triggering, so your third line will
> commit the merge? Or simply revert cleanly and restore, so your third
> line will commit the new head?

The second line (update) should progess as far as possbile on the path
From _parent_ to _tip_. If it has updated to changeset n on that path
and n+1 causes a conflict, then the working copy should reflect n (plus
the local changes). Then the local changes are committed by line 3.

By the way, I think this is (roughly) equivalent to first commiting and
then rebasing the new commit on changeset n.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20150413/f5f95595/attachment.asc>