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 <pulkit@yandex-team.ru>
Sat, 18 Aug 2018 21:03:45 +0530
branchstable
changeset 3978 fb8e44c70798
parent 1581 54f75dc48887
permissions -rw-r--r--
evolve: set the second parent if we get conflicts while evolving This patch makes sure we set the second parent correctly if we run into conflicts while evolving. Also, we need to make sure to reset to one parent before committing.
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