Mercurial > evolve
graph
-
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
-
tests: graphlog now only shows '%' if there are unresolved conflictsThu, 17 Sep 2020 19:51:08 +0800, by Anton Shestakov
-
branching: merge with stableThu, 17 Sep 2020 20:26:55 +0200, by Pierre-Yves David
-
evolvecmd: don't set `branchmerge=True` while resolving phase divergence stableThu, 17 Sep 2020 14:51:45 +0530, by Pulkit Goyal
-
gitlab-ci: display the Mercurial revision used to run the test stableThu, 17 Sep 2020 18:58:47 +0200, by Pierre-Yves David
-
rewind: sort importsTue, 21 Jul 2020 01:02:46 +0800, by Anton Shestakov
-
tests: less words and less markup to maintain in test-rewind.tWed, 15 Jul 2020 10:10:55 +0800, by Anton Shestakov
-
changelog: mention the config source fix from Matt Harbisson stableThu, 10 Sep 2020 03:11:41 +0200, by Pierre-Yves David
-
config: specify the extension when forcing a config option stableSat, 05 Sep 2020 14:46:36 -0400, by Matt Harbison
-
tests: use the modern config setting to enable evolution in topic tests stableSat, 05 Sep 2020 00:07:01 -0400, by Matt Harbison
-
branching: merge with stableTue, 08 Sep 2020 11:56:17 +0800, by Anton Shestakov
-
Added tag 10.0.2 for changeset 1cce884c9448 stableTue, 08 Sep 2020 11:23:45 +0800, by Anton Shestakov
-
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6Sun, 06 Sep 2020 06:02:34 +0800, by Anton Shestakov
-
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7Sun, 06 Sep 2020 06:02:28 +0800, by Anton Shestakov
-
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8Sun, 06 Sep 2020 06:02:24 +0800, by Anton Shestakov
-
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9Sun, 06 Sep 2020 05:47:32 +0800, by Anton Shestakov
-
test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0Sun, 06 Sep 2020 05:45:28 +0800, by Anton Shestakov
-
test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1Sun, 06 Sep 2020 05:42:26 +0800, by Anton Shestakov
-
test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2Sun, 06 Sep 2020 05:40:19 +0800, by Anton Shestakov
-
test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3Sun, 06 Sep 2020 05:38:24 +0800, by Anton Shestakov
-
test-compat: merge stable into mercurial-5.4 mercurial-5.4Sun, 06 Sep 2020 05:36:04 +0800, by Anton Shestakov
-
changelog: mention the various fix to content-divergence solvingFri, 04 Sep 2020 21:33:11 +0200, by Pierre-Yves David
-
evolve: refactor few lines for clear understandingTue, 01 Sep 2020 10:41:42 +0530, by Sushil khanchi
-
evolve: update "old-other" in evolvestate for --stop functionalityMon, 31 Aug 2020 01:19:12 +0530, by Sushil khanchi
-
evolve: make consistent usage of variable throughout the funcTue, 04 Aug 2020 23:44:08 +0530, by Sushil khanchi
-
evolve: make sure we don't miss merging content of divergent changesetsMon, 31 Aug 2020 01:10:58 +0530, by Sushil khanchi
-
evolve: add test to show broken --continue case of content divergenceWed, 05 Aug 2020 00:16:26 +0530, by Sushil khanchi
-
dirstate: replace _uncommitdirstate() by core's movedirstate() stableWed, 26 Aug 2020 00:05:52 -0700, by Martin von Zweigbergk
-
tests: add test showing that `hg uncommit --rev` can fail to mark file added stableThu, 03 Sep 2020 09:21:58 -0700, by Martin von Zweigbergk
-
evolve: use evolvestate instead of populating a variable in functionsWed, 26 Aug 2020 17:25:02 +0530, by Sushil khanchi
-
metaedit: switch to cleanupnodes() so e.g. bookmarks are movedTue, 25 Aug 2020 22:34:33 -0700, by Martin von Zweigbergk
-
tests: show how metaedit doesn't update bookmarksTue, 25 Aug 2020 22:50:28 -0700, by Martin von Zweigbergk