evolve: revision graph

graph

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

tests: back out changeset f3870eecf859 mercurial-5.5
Sat, 31 Oct 2020 18:11:13 +0800, by Anton Shestakov
tests: back out changeset 87c4b86081c1 mercurial-5.5
Sat, 31 Oct 2020 18:07:23 +0800, by Anton Shestakov
tests: back out changeset 3b7df91c2ba7 mercurial-5.5
Sat, 31 Oct 2020 18:06:07 +0800, by Anton Shestakov
test-compat: merge stable into mercurial-5.5 mercurial-5.5
Sat, 31 Oct 2020 17:47:08 +0800, by Anton Shestakov
packaging: prepare evolve version 10.1.0 stable 10.1.0
Sat, 31 Oct 2020 17:42:01 +0800, by Anton Shestakov
changelog: update for evolve 10.1.0 stable
Sat, 31 Oct 2020 17:38:11 +0800, by Anton Shestakov
branching: merge into stable in preparation for release stable
Sat, 31 Oct 2020 17:25:32 +0800, by Anton Shestakov
changelog: update for 10.0.3 stable
Sat, 31 Oct 2020 02:36:21 +0800, by Anton Shestakov
changelog: update for 10.1.0
Sat, 31 Oct 2020 02:34:31 +0800, by Anton Shestakov
branching: merge stable into default
Wed, 28 Oct 2020 20:24:26 +0100, by Pierre-Yves David
evolve: clean merge state when content divergence resolution has no changes stable
Sat, 19 Sep 2020 17:49:31 +0200, by Anton Shestakov
test-compat: back out changeset 591a0afd2ef3 stable
Fri, 08 May 2020 19:49:07 +0800, by Anton Shestakov
test-compat: back out changeset 4da1d21231ae stable
Fri, 08 May 2020 19:22:36 +0800, by Anton Shestakov
tests: {successorssets} now always return a list, affecting json output stable
Fri, 09 Oct 2020 08:39:15 -0700, by Martin von Zweigbergk
compat: add implementations of new merge.update() and merge.clean_update() stable
Fri, 02 Oct 2020 10:09:14 -0700, by Martin von Zweigbergk
compat: rename update() to _update() to make room for a new update() stable
Fri, 02 Oct 2020 09:51:45 -0700, by Martin von Zweigbergk
tests: use appropriate Python (2 or 3) for json.tool
Sun, 25 Oct 2020 21:38:37 +0800, by Anton Shestakov
tests: use appropriate Python (2 or 3) for random-revs.py
Sat, 24 Oct 2020 23:55:15 +0800, by Anton Shestakov
tests: move ad-hoc random_rev.py to testlib/random-revs.py
Sat, 24 Oct 2020 23:47:01 +0800, by Anton Shestakov
tests: use appropriate Python (2 or 3) for md5sum.py
Sat, 24 Oct 2020 23:26:41 +0800, by Anton Shestakov
test-compat: create a new compatibility branch mercurial-5.5 mercurial-5.5
Mon, 26 Oct 2020 18:32:22 +0100, by Pierre-Yves David
compat: add support for upstream rename of merge.update() to _update() stable
Fri, 25 Sep 2020 09:13:57 -0700, by Martin von Zweigbergk
unstable-list: add an item about author divergence resolution
Wed, 14 Oct 2020 12:10:05 +0200, by Sushil khanchi
unstable-list: add an item about divergence on changeset description
Wed, 14 Oct 2020 12:09:41 +0200, by Sushil khanchi
unstable-list: add an item for solving named branch divergence
Wed, 14 Oct 2020 12:09:15 +0200, by Sushil khanchi
branching: merge with stable
Tue, 20 Oct 2020 10:33:46 +0200, by Pierre-Yves David
ngtip: make revset help text slightly more descriptive stable
Mon, 12 Oct 2020 12:33:18 +0200, by Sietse Brouwer
ngtip: fix TypeError: make revset from revs, not nodes (issue6405) stable
Wed, 07 Oct 2020 09:34:59 +0200, by Sietse Brouwer
topic: add a `exp….topic.linear-merge` option to allow some oedipus
Wed, 14 Oct 2020 15:48:37 +0200, by Pierre-Yves David
branching: merge with stable
Thu, 15 Oct 2020 19:46:38 +0200, by Pierre-Yves David
rewind: actually track folds using fold-* metadata in obsmarkers
Sun, 11 Oct 2020 20:50:02 +0800, by Anton Shestakov
readme: fix syntax of format-source link stable
Mon, 12 Oct 2020 12:09:39 +0200, by Sietse Brouwer
evolvecmd: move bookmark-deactivation out of _relocatecommit()
Fri, 25 Sep 2020 21:47:30 -0700, by Martin von Zweigbergk
evolve: deactivate bookmark before updating to destination
Fri, 25 Sep 2020 15:28:17 -0700, by Martin von Zweigbergk
evolvecmd: inline _evolvemerge() into _relocatecommit()
Fri, 25 Sep 2020 13:31:41 -0700, by Martin von Zweigbergk
evolvecmd: reorder some functions to match order they're called
Fri, 25 Sep 2020 13:12:57 -0700, by Martin von Zweigbergk
evolvecmd: rename `r` to usual `stats`
Thu, 24 Sep 2020 16:54:13 -0700, by Martin von Zweigbergk
evolvecmd: simplify code for moving bookmarks when relocating node
Thu, 24 Sep 2020 16:34:04 -0700, by Martin von Zweigbergk
evolvecmd: delete bookmark-handling code obsolete since move away from rebase
Thu, 24 Sep 2020 16:15:58 -0700, by Martin von Zweigbergk
evolvecmd: rename _solveunstable() to _solveorphan()
Thu, 24 Sep 2020 15:33:01 -0700, by Martin von Zweigbergk
unstable-list: add "merging metadata" section for content-divergence
Wed, 14 Oct 2020 12:08:23 +0200, by Sushil khanchi
unstable-list: add split and fold in content-divergence resolution
Sat, 10 Oct 2020 22:44:24 +0530, by Sushil khanchi
unstable-list: add "merging files" section for content-divergence
Tue, 22 Sep 2020 13:50:45 +0530, by Sushil khanchi
unstable-list: add "finding the resolution parent" section
Tue, 22 Sep 2020 13:50:06 +0530, by Sushil khanchi
unstable-list: add a "details of resolution" section for content-divergence
Tue, 22 Sep 2020 13:49:10 +0530, by Sushil khanchi
unstable-list: add new subsections for orphan when parent is pruned
Sat, 10 Oct 2020 14:04:11 +0530, by Sushil khanchi
unstable-list: some minor updates
Sat, 10 Oct 2020 14:04:02 +0530, by Sushil khanchi
tests: {successorssets} now always return a list, affecting json output
Fri, 09 Oct 2020 08:39:15 -0700, by Martin von Zweigbergk
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

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

Mercurial > evolve

graph