Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ file revision
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
branch
stable
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.
test-drop.t
test-inhibit.t
test-simple4server.t
tests/test-simple4server-bundle2.t