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 Sushil khanchi <sushilkhanchi97@gmail.com>
Sat, 23 Nov 2019 20:25:16 +0530
branchstable
changeset 4990 f3fd3c1c3da0
parent 1742 970a4c13ebc3
permissions -rwxr-xr-x
evolve: add test to demonstrate issue6203 Current logic of content-divergence resolution contains a bug that if resolution parent is not the parent of any of the two divergent changesets, it could undo some changes. I think a good solution for this is to first relocate the divergent cset to it's obsolete parent's successor if applicable and then perform the content-divergence resolution. Next patch will fix the issue.
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