Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 5568: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip
age author description
Fri, 02 Oct 2020 10:09:14 -0700 Martin von Zweigbergk compat: add implementations of new merge.update() and merge.clean_update()
Fri, 02 Oct 2020 09:51:45 -0700 Martin von Zweigbergk compat: rename update() to _update() to make room for a new update()
Fri, 25 Sep 2020 09:13:57 -0700 Martin von Zweigbergk compat: add support for upstream rename of merge.update() to _update()
Thu, 17 Sep 2020 23:41:14 -0400 Matt Harbison tests: conditonalize a Windows only output in test-evolve-progress.t stable
Sat, 19 Sep 2020 17:56:01 +0200 Pierre-Yves David ci: drop extraneous space
Thu, 20 Aug 2020 17:32:22 +0530 Sushil khanchi evolve: resolutionparent should be succs of otherp1
Thu, 13 Aug 2020 18:10:51 +0530 Sushil khanchi evolve: handle preparation logic for public divergence in one block
Thu, 13 Aug 2020 17:22:19 +0530 Sushil khanchi evolve: add logic to decide local and other side before merge
Wed, 05 Aug 2020 14:25:29 +0530 Sushil khanchi evolve: add some initial values in evolvestate
Wed, 05 Aug 2020 14:19:29 +0530 Sushil khanchi evolve: move initial evolvestate values to main function
Mon, 31 Aug 2020 15:35:31 +0530 Sushil khanchi evolve: set other side of public content div using mutability
Mon, 31 Aug 2020 15:34:12 +0530 Sushil khanchi evolve: update some comments
Thu, 13 Aug 2020 13:30:25 +0530 Sushil khanchi evolve: move a comment where it's going to belong
Thu, 13 Aug 2020 13:28:09 +0530 Sushil khanchi evolve: update some comments acc. to upcoming behavior
Wed, 12 Aug 2020 17:30:18 +0530 Sushil khanchi evolve: move a block of code up for early return
Wed, 12 Aug 2020 17:21:05 +0530 Sushil khanchi evolve: rename haspubdiv to haspublicdiv for more clarity
Fri, 07 Aug 2020 00:25:13 +0530 Sushil khanchi evolve: add some assertions
Thu, 06 Aug 2020 18:24:32 +0530 Sushil khanchi evolve: rename param `divergent` to `local` in a function
Wed, 05 Aug 2020 15:04:48 +0530 Sushil khanchi evolve: rely on resolutionparent when relocating divergent csets
Wed, 26 Aug 2020 09:07:52 -0700 Martin von Zweigbergk compat: let cleanupnodes() handle compat across hg commit b99903534e06 stable
Wed, 26 Aug 2020 08:18:59 -0700 Martin von Zweigbergk compat: add a cleanupnodes() function stable
Tue, 25 Aug 2020 22:34:33 -0700 Martin von Zweigbergk metaedit: switch to cleanupnodes() so e.g. bookmarks are moved stable
Tue, 25 Aug 2020 22:50:28 -0700 Martin von Zweigbergk tests: show how metaedit doesn't update bookmarks stable
Tue, 21 Jul 2020 11:23:41 +0800 Anton Shestakov rewind: always compute successorsmap
Tue, 21 Jul 2020 01:04:43 +0800 Anton Shestakov rewind: add a --dry-run flag
Tue, 21 Jul 2020 01:03:18 +0800 Anton Shestakov rewind: avoid yoda condition
Thu, 17 Sep 2020 19:51:08 +0800 Anton Shestakov tests: graphlog now only shows '%' if there are unresolved conflicts
Thu, 17 Sep 2020 20:26:55 +0200 Pierre-Yves David branching: merge with stable
Thu, 17 Sep 2020 20:05:39 +0200 Pierre-Yves David test: adjust output to current stable stable
Thu, 17 Sep 2020 14:51:45 +0530 Pulkit Goyal evolvecmd: don't set `branchmerge=True` while resolving phase divergence stable
Thu, 17 Sep 2020 18:58:47 +0200 Pierre-Yves David gitlab-ci: display the Mercurial revision used to run the test stable
Tue, 21 Jul 2020 01:02:46 +0800 Anton Shestakov rewind: sort imports
Wed, 15 Jul 2020 10:10:55 +0800 Anton Shestakov tests: less words and less markup to maintain in test-rewind.t
Thu, 10 Sep 2020 03:11:41 +0200 Pierre-Yves David changelog: mention the config source fix from Matt Harbisson stable
Sat, 05 Sep 2020 14:46:36 -0400 Matt Harbison config: specify the extension when forcing a config option stable
Sat, 05 Sep 2020 00:07:01 -0400 Matt Harbison tests: use the modern config setting to enable evolution in topic tests stable
Tue, 08 Sep 2020 11:56:17 +0800 Anton Shestakov branching: merge with stable
Tue, 08 Sep 2020 11:24:38 +0800 Anton Shestakov packaging: mark as developer version stable
Tue, 08 Sep 2020 11:23:45 +0800 Anton Shestakov Added tag 10.0.2 for changeset 1cce884c9448 stable
Tue, 08 Sep 2020 11:21:49 +0800 Anton Shestakov packaging: prepare version 10.0.2 stable 10.0.2
Sun, 06 Sep 2020 06:02:34 +0800 Anton Shestakov test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sun, 06 Sep 2020 06:02:28 +0800 Anton Shestakov test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Sun, 06 Sep 2020 06:02:24 +0800 Anton Shestakov test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sun, 06 Sep 2020 05:47:32 +0800 Anton Shestakov test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
Sun, 06 Sep 2020 05:45:28 +0800 Anton Shestakov test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Sun, 06 Sep 2020 05:42:26 +0800 Anton Shestakov test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1
Sun, 06 Sep 2020 05:40:19 +0800 Anton Shestakov test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2
Sun, 06 Sep 2020 05:38:24 +0800 Anton Shestakov test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Sun, 06 Sep 2020 05:36:04 +0800 Anton Shestakov test-compat: merge stable into mercurial-5.4 mercurial-5.4
Sun, 06 Sep 2020 05:32:36 +0800 Anton Shestakov changelog: update for 10.0.2 stable
Fri, 04 Sep 2020 21:33:11 +0200 Pierre-Yves David changelog: mention the various fix to content-divergence solving
Tue, 01 Sep 2020 10:41:42 +0530 Sushil khanchi evolve: refactor few lines for clear understanding
Mon, 31 Aug 2020 01:19:12 +0530 Sushil khanchi evolve: update "old-other" in evolvestate for --stop functionality
Tue, 04 Aug 2020 23:44:08 +0530 Sushil khanchi evolve: make consistent usage of variable throughout the func
Mon, 31 Aug 2020 01:10:58 +0530 Sushil khanchi evolve: make sure we don't miss merging content of divergent changesets
Wed, 05 Aug 2020 00:16:26 +0530 Sushil khanchi evolve: add test to show broken --continue case of content divergence
Wed, 26 Aug 2020 00:05:52 -0700 Martin von Zweigbergk dirstate: replace _uncommitdirstate() by core's movedirstate() stable
Thu, 03 Sep 2020 09:21:58 -0700 Martin von Zweigbergk tests: add test showing that `hg uncommit --rev` can fail to mark file added stable
Wed, 26 Aug 2020 17:25:02 +0530 Sushil khanchi evolve: use evolvestate instead of populating a variable in functions
Tue, 25 Aug 2020 22:34:33 -0700 Martin von Zweigbergk metaedit: switch to cleanupnodes() so e.g. bookmarks are moved
less more | rev 5568: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip