evolve: revision graph

graph

less more | rev 5581: (0) -3000 -1000 -120 +120 +1000 tip

discovery: list the new heads like core does when failing a multi-head push
Thu, 17 Sep 2020 14:11:38 -0400, by Matt Harbison
evolve: remove trailing white spaces
Fri, 21 Aug 2020 18:05:37 +0530, by Sushil khanchi
evolve: refactor some error raising logic in content-divergence
Fri, 21 Aug 2020 18:04:48 +0530, by Sushil khanchi
evolve: update public content divergence acc. to new behavior
Fri, 21 Aug 2020 16:22:24 +0530, by Sushil khanchi
evolve: move a line a code block above
Fri, 21 Aug 2020 01:28:33 +0530, by Sushil khanchi
evolve: rename a func and some updates around it
Fri, 21 Aug 2020 01:27:58 +0530, by Sushil khanchi
evolve: update some comments
Thu, 20 Aug 2020 23:54:27 +0530, by Sushil khanchi
evolve: no need to return divergent and other
Fri, 21 Aug 2020 01:04:08 +0530, by Sushil khanchi
evolve: remove an evolvestate which is no more required
Fri, 21 Aug 2020 00:56:24 +0530, by Sushil khanchi
evolve: remove swapping nodes logic while resolving divergence
Sun, 20 Sep 2020 09:22:04 +0530, by Sushil khanchi
evolve: don't set evolved node as dirstate p2
Fri, 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 stable
Thu, 17 Sep 2020 23:41:14 -0400, by Matt Harbison
ci: drop extraneous space
Sat, 19 Sep 2020 17:56:01 +0200, by Pierre-Yves David
evolve: resolutionparent should be succs of otherp1
Thu, 20 Aug 2020 17:32:22 +0530, by Sushil khanchi
evolve: handle preparation logic for public divergence in one block
Thu, 13 Aug 2020 18:10:51 +0530, by Sushil khanchi
evolve: add logic to decide local and other side before merge
Thu, 13 Aug 2020 17:22:19 +0530, by Sushil khanchi
evolve: add some initial values in evolvestate
Wed, 05 Aug 2020 14:25:29 +0530, by Sushil khanchi
evolve: move initial evolvestate values to main function
Wed, 05 Aug 2020 14:19:29 +0530, by Sushil khanchi
evolve: set other side of public content div using mutability
Mon, 31 Aug 2020 15:35:31 +0530, by Sushil khanchi
evolve: update some comments
Mon, 31 Aug 2020 15:34:12 +0530, by Sushil khanchi
evolve: move a comment where it's going to belong
Thu, 13 Aug 2020 13:30:25 +0530, by Sushil khanchi
evolve: update some comments acc. to upcoming behavior
Thu, 13 Aug 2020 13:28:09 +0530, by Sushil khanchi
evolve: move a block of code up for early return
Wed, 12 Aug 2020 17:30:18 +0530, by Sushil khanchi
evolve: rename haspubdiv to haspublicdiv for more clarity
Wed, 12 Aug 2020 17:21:05 +0530, by Sushil khanchi
evolve: add some assertions
Fri, 07 Aug 2020 00:25:13 +0530, by Sushil khanchi
evolve: rename param `divergent` to `local` in a function
Thu, 06 Aug 2020 18:24:32 +0530, by Sushil khanchi
evolve: rely on resolutionparent when relocating divergent csets
Wed, 05 Aug 2020 15:04:48 +0530, by Sushil khanchi
compat: let cleanupnodes() handle compat across hg commit b99903534e06 stable
Wed, 26 Aug 2020 09:07:52 -0700, by Martin von Zweigbergk
compat: add a cleanupnodes() function stable
Wed, 26 Aug 2020 08:18:59 -0700, by Martin von Zweigbergk
metaedit: switch to cleanupnodes() so e.g. bookmarks are moved stable
Tue, 25 Aug 2020 22:34:33 -0700, by Martin von Zweigbergk
tests: show how metaedit doesn't update bookmarks stable
Tue, 25 Aug 2020 22:50:28 -0700, by Martin von Zweigbergk
rewind: always compute successorsmap
Tue, 21 Jul 2020 11:23:41 +0800, by Anton Shestakov
rewind: add a --dry-run flag
Tue, 21 Jul 2020 01:04:43 +0800, by Anton Shestakov
rewind: avoid yoda condition
Tue, 21 Jul 2020 01:03:18 +0800, by Anton Shestakov
tests: graphlog now only shows '%' if there are unresolved conflicts
Thu, 17 Sep 2020 19:51:08 +0800, by Anton Shestakov
branching: merge with stable
Thu, 17 Sep 2020 20:26:55 +0200, by Pierre-Yves David
test: adjust output to current stable stable
Thu, 17 Sep 2020 20:05:39 +0200, by Pierre-Yves David
evolvecmd: don't set `branchmerge=True` while resolving phase divergence stable
Thu, 17 Sep 2020 14:51:45 +0530, by Pulkit Goyal
gitlab-ci: display the Mercurial revision used to run the test stable
Thu, 17 Sep 2020 18:58:47 +0200, by Pierre-Yves David
rewind: sort imports
Tue, 21 Jul 2020 01:02:46 +0800, by Anton Shestakov
tests: less words and less markup to maintain in test-rewind.t
Wed, 15 Jul 2020 10:10:55 +0800, by Anton Shestakov
changelog: mention the config source fix from Matt Harbisson stable
Thu, 10 Sep 2020 03:11:41 +0200, by Pierre-Yves David
config: specify the extension when forcing a config option stable
Sat, 05 Sep 2020 14:46:36 -0400, by Matt Harbison
tests: use the modern config setting to enable evolution in topic tests stable
Sat, 05 Sep 2020 00:07:01 -0400, by Matt Harbison
branching: merge with stable
Tue, 08 Sep 2020 11:56:17 +0800, by Anton Shestakov
packaging: mark as developer version stable
Tue, 08 Sep 2020 11:24:38 +0800, by Anton Shestakov
Added tag 10.0.2 for changeset 1cce884c9448 stable
Tue, 08 Sep 2020 11:23:45 +0800, by Anton Shestakov
packaging: prepare version 10.0.2 stable 10.0.2
Tue, 08 Sep 2020 11:21:49 +0800, by Anton Shestakov
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sun, 06 Sep 2020 06:02:34 +0800, by Anton Shestakov
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Sun, 06 Sep 2020 06:02:28 +0800, by Anton Shestakov
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sun, 06 Sep 2020 06:02:24 +0800, by Anton Shestakov
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
Sun, 06 Sep 2020 05:47:32 +0800, by Anton Shestakov
test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Sun, 06 Sep 2020 05:45:28 +0800, by Anton Shestakov
test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1
Sun, 06 Sep 2020 05:42:26 +0800, by Anton Shestakov
test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2
Sun, 06 Sep 2020 05:40:19 +0800, by Anton Shestakov
test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Sun, 06 Sep 2020 05:38:24 +0800, by Anton Shestakov
test-compat: merge stable into mercurial-5.4 mercurial-5.4
Sun, 06 Sep 2020 05:36:04 +0800, by Anton Shestakov
changelog: update for 10.0.2 stable
Sun, 06 Sep 2020 05:32:36 +0800, by Anton Shestakov
changelog: mention the various fix to content-divergence solving
Fri, 04 Sep 2020 21:33:11 +0200, by Pierre-Yves David
evolve: refactor few lines for clear understanding
Tue, 01 Sep 2020 10:41:42 +0530, by Sushil khanchi
evolve: update "old-other" in evolvestate for --stop functionality
Mon, 31 Aug 2020 01:19:12 +0530, by Sushil khanchi
evolve: make consistent usage of variable throughout the func
Tue, 04 Aug 2020 23:44:08 +0530, by Sushil khanchi
evolve: make sure we don't miss merging content of divergent changesets
Mon, 31 Aug 2020 01:10:58 +0530, by Sushil khanchi
evolve: add test to show broken --continue case of content divergence
Wed, 05 Aug 2020 00:16:26 +0530, by Sushil khanchi
dirstate: replace _uncommitdirstate() by core's movedirstate() stable
Wed, 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 stable
Thu, 03 Sep 2020 09:21:58 -0700, by Martin von Zweigbergk
evolve: use evolvestate instead of populating a variable in functions
Wed, 26 Aug 2020 17:25:02 +0530, by Sushil khanchi
metaedit: switch to cleanupnodes() so e.g. bookmarks are moved
Tue, 25 Aug 2020 22:34:33 -0700, by Martin von Zweigbergk
tests: show how metaedit doesn't update bookmarks
Tue, 25 Aug 2020 22:50:28 -0700, by Martin von Zweigbergk
topic: fix the `topic(...)` revset to not select commits without a topic stable
Tue, 01 Sep 2020 23:35:43 -0400, by Matt Harbison
unstable-list: fix title level
Wed, 26 Aug 2020 14:09:09 +0200, by Pierre-Yves David
unstable-list: add local table of content of each details section
Wed, 26 Aug 2020 13:07:57 +0200, by Pierre-Yves David
unstable-list: add a general table of content
Wed, 26 Aug 2020 13:07:35 +0200, by Pierre-Yves David
unstable-list: move copytright after the title
Wed, 26 Aug 2020 16:10:29 +0200, by Pierre-Yves David
split: use the last created commit as target for discard action stable
Sat, 22 Aug 2020 07:24:46 +0800, by Anton Shestakov
split: demonstrate that discard after more than one commit is misbehaving stable
Sat, 22 Aug 2020 07:18:55 +0800, by Anton Shestakov
unstable-list: add cause-of-trouble for content-divergence
Tue, 18 Aug 2020 12:35:24 +0530, by Sushil khanchi
unstable-list: mark the subsection as yet to document
Tue, 18 Aug 2020 19:32:13 +0530, by Sushil khanchi
unstable-list: expand and clarify the source of complexity for phase-div
Wed, 26 Aug 2020 12:03:32 +0200, by Pierre-Yves David
unstable-list: add source-of-complexity for phase-divergence
Tue, 18 Aug 2020 08:47:15 +0530, by Sushil khanchi
unstable-list: expand a bit the "cause of trouble" for phase divergence
Wed, 26 Aug 2020 11:55:19 +0200, by Pierre-Yves David
unstable-list: add cause-of-trouble section for phase-divergence
Mon, 17 Aug 2020 16:52:26 +0530, by Sushil khanchi
unstable-list: simplify the basic
Wed, 26 Aug 2020 11:51:14 +0200, by Pierre-Yves David
unstable-list: add basic section for phase-divergence
Mon, 17 Aug 2020 16:44:13 +0530, by Sushil khanchi
unstable-list: some cleanup
Mon, 17 Aug 2020 13:47:52 +0530, by Sushil khanchi
unstable-list: some details about phase divergence
Wed, 26 Aug 2020 12:39:47 +0200, by Pierre-Yves David
unstable-list: add basic description of content divergence
Fri, 14 Aug 2020 18:05:33 +0200, by Pierre-Yves David
unstable-list: more entry for orphan SPLIT ME
Fri, 14 Aug 2020 18:04:22 +0200, by Pierre-Yves David
unstable-list: add a entry about pruned parent
Fri, 14 Aug 2020 18:03:13 +0200, by Pierre-Yves David
unstable-list: add a simple entry for the simplest orphan case
Fri, 14 Aug 2020 18:01:53 +0200, by Pierre-Yves David
unstable-list: add list the source of complexity during resolution
Fri, 14 Aug 2020 18:10:10 +0200, by Pierre-Yves David
unstable-list: add information about when/why orphan appears
Fri, 14 Aug 2020 18:09:42 +0200, by Pierre-Yves David
unstable-list: add the basic about orphan changesets
Fri, 14 Aug 2020 18:08:48 +0200, by Pierre-Yves David
unstable-list: add an introduction text
Fri, 14 Aug 2020 17:59:51 +0200, by Pierre-Yves David
doc: add the bases of a developer doc for instability
Fri, 14 Aug 2020 17:58:21 +0200, by Pierre-Yves David
branching: merge with stable
Tue, 25 Aug 2020 10:12:29 +0200, by Pierre-Yves David
split: compatibility with cmdutil.revert() without parents argument stable
Fri, 21 Aug 2020 23:04:03 +0800, by Anton Shestakov
rewind: compatibility with cmdutil.revert() without parents argument stable
Fri, 21 Aug 2020 21:37:37 +0800, by Anton Shestakov
evolve: test that new suggestions works
Fri, 24 Jul 2020 00:18:12 +0530, by Sushil khanchi
evolve: improve warning msg when skipping orphan resolution
Wed, 22 Jul 2020 23:40:24 +0530, by Sushil khanchi
orphan: fix buggy case of try resolving orphan merge two times
Wed, 22 Jul 2020 23:37:59 +0530, by Sushil khanchi
evolve: add more testing for parent-child form content-div
Tue, 28 Jul 2020 14:26:44 +0530, by Sushil khanchi
evolve: fix content-div resolution when in parent-child form
Sun, 26 Jul 2020 01:02:22 +0530, by Sushil khanchi
tests: add a log -G to demonstrate a fix in next patch
Sun, 26 Jul 2020 00:35:52 +0530, by Sushil khanchi
test: no need to look at full log
Mon, 30 Dec 2019 00:43:17 +0530, by Sushil khanchi
tests: update output to match c515c54f6530 in core
Fri, 07 Aug 2020 12:46:17 +0800, by Anton Shestakov
py3: use '%d' for formatting revision numbers in stable range cache warning stable
Sun, 02 Aug 2020 12:02:09 +0800, by Anton Shestakov
branching: merge with stable
Fri, 31 Jul 2020 22:07:49 +0800, by Anton Shestakov
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Fri, 31 Jul 2020 19:19:13 +0800, by Anton Shestakov
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Fri, 31 Jul 2020 19:14:30 +0800, by Anton Shestakov
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Fri, 31 Jul 2020 19:12:44 +0800, by Anton Shestakov
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
Fri, 31 Jul 2020 19:02:33 +0800, by Anton Shestakov
test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Fri, 31 Jul 2020 18:54:28 +0800, by Anton Shestakov
test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1
Fri, 31 Jul 2020 18:40:28 +0800, by Anton Shestakov
test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2
Fri, 31 Jul 2020 18:25:50 +0800, by Anton Shestakov

less more | rev 5581: (0) -3000 -1000 -120 +120 +1000 tip

Mercurial > evolve

graph