Mercurial > evolve
diff tests/test-sharing.t @ 3802:4bad80f1aad3
evolve: pop up editor if conflicts occur while merging commit messages
Last patch added support for merging commit messages while resolving content
divergence. In case of conflicts we fallback to one of the divergent commit
messages.
After this patch, we will pop up an editor where user has to resolve the
conflicts in the commit messages and then continue.
Tests are added for this. We need to fix handling in test-sharing.t to use
HGEDITOR to fix conflicts and pass the new commit message.
Future improvement can be that we should respect HGMERGE while merging commit
descriptions too.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Wed, 06 Jun 2018 03:26:47 +0530 |
parents | dc81a788f278 |
children | f9dad99a90d5 |
line wrap: on
line diff
--- a/tests/test-sharing.t Mon Jun 04 01:28:02 2018 +0530 +++ b/tests/test-sharing.t Wed Jun 06 03:26:47 2018 +0530 @@ -505,7 +505,14 @@ 6:e3f99ce9d9cd draft fix bug 24 (v2 by alice) Use evolve to fix the divergence. - $ HGMERGE=internal:other hg evolve --content-divergent + $ cat > editor.sh <<EOF + > #!/bin/sh + > cat > \$1 <<ENDOF + > fix bug 24 (v2 by bob) + > ENDOF + > EOF + + $ HGEDITOR='sh ./editor.sh' HGMERGE=internal:other hg evolve --content-divergent merge:[5] fix bug 24 (v2 by bob) with: [6] fix bug 24 (v2 by alice) base: [4] fix bug 24 (v1)