Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 5587: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip
age author description
Tue, 22 Sep 2020 13:50:45 +0530 Sushil khanchi unstable-list: add "merging files" section for content-divergence
Tue, 22 Sep 2020 13:50:06 +0530 Sushil khanchi unstable-list: add "finding the resolution parent" section
Tue, 22 Sep 2020 13:49:10 +0530 Sushil khanchi unstable-list: add a "details of resolution" section for content-divergence
Sat, 10 Oct 2020 14:04:11 +0530 Sushil khanchi unstable-list: add new subsections for orphan when parent is pruned
Sat, 10 Oct 2020 14:04:02 +0530 Sushil khanchi unstable-list: some minor updates
Fri, 09 Oct 2020 08:39:15 -0700 Martin von Zweigbergk tests: {successorssets} now always return a list, affecting json output
Thu, 17 Sep 2020 14:11:38 -0400 Matt Harbison discovery: list the new heads like core does when failing a multi-head push
Fri, 21 Aug 2020 18:05:37 +0530 Sushil khanchi evolve: remove trailing white spaces
Fri, 21 Aug 2020 18:04:48 +0530 Sushil khanchi evolve: refactor some error raising logic in content-divergence
Fri, 21 Aug 2020 16:22:24 +0530 Sushil khanchi evolve: update public content divergence acc. to new behavior
Fri, 21 Aug 2020 01:28:33 +0530 Sushil khanchi evolve: move a line a code block above
Fri, 21 Aug 2020 01:27:58 +0530 Sushil khanchi evolve: rename a func and some updates around it
Thu, 20 Aug 2020 23:54:27 +0530 Sushil khanchi evolve: update some comments
Fri, 21 Aug 2020 01:04:08 +0530 Sushil khanchi evolve: no need to return divergent and other
Fri, 21 Aug 2020 00:56:24 +0530 Sushil khanchi evolve: remove an evolvestate which is no more required
Sun, 20 Sep 2020 09:22:04 +0530 Sushil khanchi evolve: remove swapping nodes logic while resolving divergence
Fri, 25 Sep 2020 11:06:46 -0700 Martin von Zweigbergk evolve: don't set evolved node as dirstate p2
Thu, 17 Sep 2020 21:19:13 +0200 Pierre-Yves David changelog: mention `hg rewind --dry-run`
Tue, 22 Sep 2020 13:43:41 +0530 Sushil khanchi evolve: update docstring for mergeusers()
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
less more | rev 5587: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip