Mercurial > evolve
graph
-
evolve: make `--abort` strip the temporary revs created during resolutionWed, 23 May 2018 02:46:20 +0530, by Pulkit Goyal
-
evolve: store a list of temprevs in evolvestateWed, 23 May 2018 02:43:23 +0530, by Pulkit Goyal
-
evolve: check for None before adding in set of revisions to stripWed, 23 May 2018 02:36:14 +0530, by Pulkit Goyal
-
evolve: return the new replacement node to be stored in evolvestateWed, 23 May 2018 02:33:14 +0530, by Pulkit Goyal
-
evolve: don't make values of replacements dict listsWed, 23 May 2018 02:39:38 +0530, by Pulkit Goyal
-
tests: add a test file `--abort` flag while resolving phase-divergenceWed, 23 May 2018 02:41:08 +0530, by Pulkit Goyal
-
evolve: pass revisions as strings to commands.*() stableTue, 15 May 2018 22:17:27 -0700, by Martin von Zweigbergk
-
tests: rename test-evolve-abort.t to test-evolve-abort-orphan.tWed, 23 May 2018 01:27:13 +0530, by Pulkit Goyal
-
branching: merge with branch for stableMon, 21 May 2018 16:56:52 +0200, by Pierre-Yves David
-
compat: update obshashrange test outputMon, 21 May 2018 16:25:29 +0200, by Boris Feld
-
test: update to new outputsMon, 21 May 2018 14:56:51 +0200, by Boris Feld
-
compat: fix obslog with Mercurial 4.6+Mon, 21 May 2018 13:07:49 +0200, by Boris Feld
-
debian: add line to clean-docs target to delete additional docs file stableSat, 19 May 2018 18:26:36 +0530, by Faheem Mitha
-
amend: use context manager for locks (issue5887) stableMon, 14 May 2018 15:25:38 -0700, by Martin von Zweigbergk
-
evolve: point to '--abort' in verbose status message stableThu, 10 May 2018 21:37:28 -0700, by Martin von Zweigbergk
-
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