Mercurial > evolve
graph
-
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
-
evolve: update some comments acc. to upcoming behaviorThu, 13 Aug 2020 13:28:09 +0530, by Sushil khanchi
-
evolve: move a block of code up for early returnWed, 12 Aug 2020 17:30:18 +0530, by Sushil khanchi
-
evolve: rename haspubdiv to haspublicdiv for more clarityWed, 12 Aug 2020 17:21:05 +0530, by Sushil khanchi
-
evolve: add some assertionsFri, 07 Aug 2020 00:25:13 +0530, by Sushil khanchi
-
evolve: rename param `divergent` to `local` in a functionThu, 06 Aug 2020 18:24:32 +0530, by Sushil khanchi
-
evolve: rely on resolutionparent when relocating divergent csetsWed, 05 Aug 2020 15:04:48 +0530, by Sushil khanchi
-
compat: let cleanupnodes() handle compat across hg commit b99903534e06 stableWed, 26 Aug 2020 09:07:52 -0700, by Martin von Zweigbergk
-
compat: add a cleanupnodes() function stableWed, 26 Aug 2020 08:18:59 -0700, by Martin von Zweigbergk
-
metaedit: switch to cleanupnodes() so e.g. bookmarks are moved stableTue, 25 Aug 2020 22:34:33 -0700, by Martin von Zweigbergk
-
tests: show how metaedit doesn't update bookmarks stableTue, 25 Aug 2020 22:50:28 -0700, by Martin von Zweigbergk
-
rewind: always compute successorsmapTue, 21 Jul 2020 11:23:41 +0800, by Anton Shestakov
-
rewind: add a --dry-run flagTue, 21 Jul 2020 01:04:43 +0800, by Anton Shestakov
-
rewind: avoid yoda conditionTue, 21 Jul 2020 01:03:18 +0800, by Anton Shestakov