Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ graph
summary
|
shortlog
|
changelog
| graph |
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
less
more
|
(0)
-3000
-1000
-300
-100
-14
+14
+100
+300
+1000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
The revision graph only works with JavaScript-enabled browsers.
tests: add more test of resolution of content-divergent changesets
2018-06-07, by Pulkit Goyal
evolvestate: store info about relocation while resolving content-divergence
2018-06-07, by Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
2018-06-07, by Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
2018-06-07, by Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
2018-06-07, by Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
2018-06-01, by Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
2018-06-01, by Pulkit Goyal
CHANGELOG: add an entry about fixing issue5877
2018-06-06, by Pulkit Goyal
evolve: pop up editor if conflicts occur while merging commit messages
2018-06-06, by Pulkit Goyal
evolve: merge commit messages while resolving content-divergence (issue5877)
2018-06-04, by Pulkit Goyal
evolve: move if-else block under the right block
2018-06-06, by Pulkit Goyal
tests: make sure we don't result in commit messages conflict
2018-06-05, by Pulkit Goyal
tests: don't use mkcommit shell function in test-divergent.t
2018-06-05, by Pulkit Goyal
evolve: remove duplicated documentation
2018-06-06, by Pierre-Yves David
less
more
|
(0)
-3000
-1000
-300
-100
-14
+14
+100
+300
+1000
tip