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>
Mon, 22 Jan 2018 17:54:27 +0530
changeset 3479 4b9fc8c85ee4
parent 1581 54f75dc48887
permissions -rw-r--r--
evolvecmd: use the evolvestate object passed as argument in _solveunstable Earlier if get a merge conflict, we used to initialize a new evolvestate object and used to save it. Let's start using the state object which we get in as argument as that will contain more data about the state.
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