view tests/test-check-setup-manifest.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.

#require test-repo

  $ checkcm() {
  >   if ! (which check-manifest > /dev/null); then
  >     echo skipped: missing tool: check-manifest;
  >     exit 80;
  >   fi;
  > };
  $ checkcm
  $ cat << EOF >> $HGRCPATH
  > [experimental]
  > evolution=all
  > EOF

Run check manifest:

  $ cd $TESTDIR/..
  $ check-manifest
  lists of files in version control and sdist match