Mercurial > evolve
annotate tests/fake-editor.sh @ 3632:8d38b88233cb
evolve: move logic to resolve phase-divergence in a new function
This patch moves logic which does the revert and create a commit on top of
public changeset because we need to repeat that logic while handling
continuation of `hg evolve` when there are conflicts while rebasing the
phase-divergent changeset.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 24 Mar 2018 16:41:14 +0530 |
parents | 970a4c13ebc3 |
children |
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 |