Mercurial
Mercurial
>
pub
>
hg
>
evolve
/ shortlog
summary
| shortlog |
changelog
|
graph
|
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
(0)
-3000
-1000
-300
-100
-30
-10
-8
+8
+10
+30
+100
+300
+1000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Thu, 07 Jun 2018 22:59:39 +0530
Pulkit Goyal
evolve: store the evolvestate if relocation results in conflicts
changeset
|
files
Thu, 07 Jun 2018 22:45:54 +0530
Pulkit Goyal
tests: add more test of resolution of content-divergent changesets
changeset
|
files
Thu, 07 Jun 2018 18:18:10 +0530
Pulkit Goyal
evolvestate: store info about relocation while resolving content-divergence
changeset
|
files
Thu, 07 Jun 2018 18:13:54 +0530
Pulkit Goyal
evolve: factor out logic to merge content divergent csets in separate fn
changeset
|
files
Thu, 07 Jun 2018 20:27:03 +0530
Pulkit Goyal
evolve: commit the transaction if conflicts occur while merging content-div
changeset
|
files
Thu, 07 Jun 2018 15:54:32 +0530
Pulkit Goyal
tests: add tests for resolving content-divergence when different parents
changeset
|
files
Fri, 01 Jun 2018 19:52:06 +0530
Pulkit Goyal
evolve: implement resolution of content-divergence when on differet parents
changeset
|
files
Fri, 01 Jun 2018 19:57:19 +0530
Pulkit Goyal
tests: add tests for resolving content-divergence with parent change
changeset
|
files
(0)
-3000
-1000
-300
-100
-30
-10
-8
+8
+10
+30
+100
+300
+1000
tip