Mercurial > evolve

annotate tests/fake-editor.sh @ 5539:452651e69848 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolvecmd: don't set `branchmerge=True` while resolving phase divergence We are not going to create a merge commit, neither we are using two parents in any way. I am unable to see any reason why `branchmerge` should be passed as `True` here. Passing branchmerge as True leads to side effect of having merge related commit information stored in mergestate which leads us to having an active mergestate.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 17 Sep 2020 14:51:45 +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