Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
(0)
-3000
-1000
-300
-100
-30
-10
-1
+1
+10
+30
+100
+300
+1000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Sat, 18 Aug 2018 21:03:45 +0530
evolve: set the second parent if we get conflicts while evolving
stable
changeset
Pulkit Goyal <pulkit@yandex-team.ru> [Sat, 18 Aug 2018 21:03:45 +0530] rev 3978
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.
(0)
-3000
-1000
-300
-100
-30
-10
-1
+1
+10
+30
+100
+300
+1000
tip