Mercurial > evolve
graph
-
unstable-list: add a "details of resolution" section for content-divergenceTue, 22 Sep 2020 13:49:10 +0530, by Sushil khanchi
-
unstable-list: add new subsections for orphan when parent is prunedSat, 10 Oct 2020 14:04:11 +0530, by Sushil khanchi
-
unstable-list: some minor updatesSat, 10 Oct 2020 14:04:02 +0530, by Sushil khanchi
-
tests: {successorssets} now always return a list, affecting json outputFri, 09 Oct 2020 08:39:15 -0700, by Martin von Zweigbergk
-
discovery: list the new heads like core does when failing a multi-head pushThu, 17 Sep 2020 14:11:38 -0400, by Matt Harbison
-
evolve: remove trailing white spacesFri, 21 Aug 2020 18:05:37 +0530, by Sushil khanchi
-
evolve: refactor some error raising logic in content-divergenceFri, 21 Aug 2020 18:04:48 +0530, by Sushil khanchi
-
evolve: update public content divergence acc. to new behaviorFri, 21 Aug 2020 16:22:24 +0530, by Sushil khanchi
-
evolve: move a line a code block aboveFri, 21 Aug 2020 01:28:33 +0530, by Sushil khanchi
-
evolve: rename a func and some updates around itFri, 21 Aug 2020 01:27:58 +0530, by Sushil khanchi
-
evolve: update some commentsThu, 20 Aug 2020 23:54:27 +0530, by Sushil khanchi
-
evolve: no need to return divergent and otherFri, 21 Aug 2020 01:04:08 +0530, by Sushil khanchi
-
evolve: remove an evolvestate which is no more requiredFri, 21 Aug 2020 00:56:24 +0530, by Sushil khanchi
-
evolve: remove swapping nodes logic while resolving divergenceSun, 20 Sep 2020 09:22:04 +0530, by Sushil khanchi
-
evolve: don't set evolved node as dirstate p2Fri, 25 Sep 2020 11:06:46 -0700, by Martin von Zweigbergk
-
changelog: mention `hg rewind --dry-run`Thu, 17 Sep 2020 21:19:13 +0200, by Pierre-Yves David
-
evolve: update docstring for mergeusers()Tue, 22 Sep 2020 13:43:41 +0530, by Sushil khanchi
-
compat: add implementations of new merge.update() and merge.clean_update()Fri, 02 Oct 2020 10:09:14 -0700, by Martin von Zweigbergk
-
compat: rename update() to _update() to make room for a new update()Fri, 02 Oct 2020 09:51:45 -0700, by Martin von Zweigbergk
-
compat: add support for upstream rename of merge.update() to _update()Fri, 25 Sep 2020 09:13:57 -0700, by Martin von Zweigbergk
-
tests: conditonalize a Windows only output in test-evolve-progress.t stableThu, 17 Sep 2020 23:41:14 -0400, by Matt Harbison
-
ci: drop extraneous spaceSat, 19 Sep 2020 17:56:01 +0200, by Pierre-Yves David
-
evolve: resolutionparent should be succs of otherp1Thu, 20 Aug 2020 17:32:22 +0530, by Sushil khanchi
-
evolve: handle preparation logic for public divergence in one blockThu, 13 Aug 2020 18:10:51 +0530, by Sushil khanchi
-
evolve: add logic to decide local and other side before mergeThu, 13 Aug 2020 17:22:19 +0530, by Sushil khanchi
-
evolve: add some initial values in evolvestateWed, 05 Aug 2020 14:25:29 +0530, by Sushil khanchi
-
evolve: move initial evolvestate values to main functionWed, 05 Aug 2020 14:19:29 +0530, by Sushil khanchi
-
evolve: set other side of public content div using mutabilityMon, 31 Aug 2020 15:35:31 +0530, by Sushil khanchi
-
evolve: update some commentsMon, 31 Aug 2020 15:34:12 +0530, by Sushil khanchi
-
evolve: move a comment where it's going to belongThu, 13 Aug 2020 13:30:25 +0530, by Sushil khanchi