Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/fake-editor.sh
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 11 Jun 2018 01:00:57 +0530
changeset 3828 c58ebf5d2f57
parent 1742 970a4c13ebc3
permissions -rwxr-xr-x
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
evolve