Mercurial > evolve
graph
-
evolvecmd: add comments and new lines in content-divergence handling logicSun, 22 Apr 2018 20:14:42 +0530, by Pulkit Goyal
-
evolve: show cset hash in "merging conetnt-divergent changeset"Sun, 29 Apr 2018 19:18:54 +0530, by Pulkit Goyal
-
evolve: show cset hash in "update to local conflict" messageSun, 29 Apr 2018 19:14:41 +0530, by Pulkit Goyal
-
evolve: use hg.updaterepo() instead of hg.update() to hide statsSun, 29 Apr 2018 19:11:29 +0530, by Pulkit Goyal
-
evolve: fix the conflicts error message during content-divergence resolutionSun, 29 Apr 2018 19:04:18 +0530, by Pulkit Goyal
-
evolve: add logic to continue interrupted content-divergence resolutionSun, 29 Apr 2018 18:51:56 +0530, by Pulkit Goyal
-
evolve: store the evolvestate file when encountering conflictsSun, 29 Apr 2018 18:48:36 +0530, by Pulkit Goyal
-
evolve: take out logic to complete phase-divergence in separate fnSun, 29 Apr 2018 18:13:29 +0530, by Pulkit Goyal
-
evolve: store divergent nodes in evolvestate when resolving content-divergenceSun, 29 Apr 2018 17:54:01 +0530, by Pulkit Goyal
-
branching: merge stable into defaultWed, 02 May 2018 11:59:06 +0200, by Pierre-Yves David
-
tests: add test showing `hg evolve --stop` works fine with phase-divergence stableSat, 28 Apr 2018 18:44:07 +0530, by Pulkit Goyal
-
tests: rename the test file to add 'orphan' in the name stableSat, 28 Apr 2018 18:03:32 +0530, by Pulkit Goyal
-
tests: test that `hg obslog wdir()` aborts with a useful message stableFri, 27 Apr 2018 16:28:34 +0800, by Anton Shestakov
-
obshistory: make obslog work when a commit doesn't have any description stableFri, 27 Apr 2018 16:19:45 +0800, by Anton Shestakov
-
obshistory: use a more appropriate type for obslog entries stableFri, 27 Apr 2018 16:14:10 +0800, by Anton Shestakov