Mercurial > evolve

annotate tests/fake-editor.sh @ 3828:c58ebf5d2f57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add more test of --stop while resolving content-divergence This tests the --stop flag when conflicts occur while relocating one of the divergent changesets.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 01:00:57 +0530
parents 970a4c13ebc3
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1742
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
diff changeset
1 #!/bin/sh
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
diff changeset
2 sleep 5
970a4c13ebc3 evolve: lock the working copy early in next and prev (issue5244)
Simon Farnsworth <simonfar@fb.com>
parents:
diff changeset
3 echo "new desc" >> $1