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 Manuel Jacob <me@manueljacob.de>
Fri, 11 Oct 2019 21:32:27 +0200
branchstable
changeset 4998 88b816a9d990
parent 1581 54f75dc48887
permissions -rw-r--r--
evolve: preserve date when resolving content-divergence (issue6202) This patch changes the implementation to do a 3 way merge. In case of actual conflict, it take the newest date from both sides of the content-divergence.
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