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.
debian/test-blacklist
author Pulkit Goyal <7895pulkit@gmail.com>
Thu, 07 Jun 2018 18:18:10 +0530
changeset 3809 f06ff8fee2f6
parent 1581 54f75dc48887
permissions -rw-r--r--
evolvestate: store info about relocation while resolving content-divergence While resolving content-divergence when they are on different parents, we relocate one of the node to parent of another one and this can lead to conflicts sometimes. So we need to store information about that state in evolvestate so that we can use that when user does `hg evolve --continue` or `--stop` or `--abort`. Now that we make sure, we store the new other node in evolvestate, we fix the behavior of handling the relocated commit and merge the right changesets.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1165
f0978cb993a0 debian: blacklist test-drop
Julien Cristau <julien.cristau@logilab.fr>
parents:
diff changeset 
     1
 
test-drop.t
1581
54f75dc48887 debian: blacklist test-inhibit.t
Laurent Charignon <lcharignon@fb.com>
parents: 1166
diff changeset 
     2
 
test-inhibit.t
1166
30b478854260 debian: blacklist simple4server tests
Julien Cristau <julien.cristau@logilab.fr>
parents: 1165
diff changeset 
     3
 
test-simple4server.t
30b478854260 debian: blacklist simple4server tests
Julien Cristau <julien.cristau@logilab.fr>
parents: 1165
diff changeset 
     4
 
tests/test-simple4server-bundle2.t
evolve