evolve: revision graph

graph

less more | rev 5766: (0) -3000 -1000 -240 +240 +1000 tip

test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Sun, 31 Jan 2021 16:15:26 +0800, by Anton Shestakov
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sun, 31 Jan 2021 16:06:16 +0800, by Anton Shestakov
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
Sun, 31 Jan 2021 15:57:57 +0800, by Anton Shestakov
test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Sun, 31 Jan 2021 15:39:25 +0800, by Anton Shestakov
test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1
Sat, 30 Jan 2021 20:58:19 +0800, by Anton Shestakov
test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2
Sat, 30 Jan 2021 20:53:45 +0800, by Anton Shestakov
test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Sat, 30 Jan 2021 20:49:07 +0800, by Anton Shestakov
test-compat: merge mercurial-5.5 into mercurial-5.4 mercurial-5.4
Sat, 30 Jan 2021 20:42:49 +0800, by Anton Shestakov
test-compat: merge mercurial-5.6 into mercurial-5.5 mercurial-5.5
Sat, 30 Jan 2021 20:32:38 +0800, by Anton Shestakov
tests: update branch cache writes in blackbox output (only strips) mercurial-5.6
Fri, 29 Jan 2021 17:23:31 +0800, by Anton Shestakov
tests: back out tests for oneline-summary support from 8c7de8f8bb42 mercurial-5.6
Fri, 29 Jan 2021 17:18:32 +0800, by Anton Shestakov
tests: back out changeset d0f73113fcc0 mercurial-5.6
Thu, 28 Jan 2021 18:57:49 +0800, by Anton Shestakov
tests: back out changeset 59b2be90e9fd mercurial-5.6
Thu, 28 Jan 2021 18:57:48 +0800, by Anton Shestakov
tests: back out changeset ceaa85c47973 mercurial-5.6
Thu, 28 Jan 2021 18:48:41 +0800, by Anton Shestakov
tests: back out changeset 84393bcf9859 mercurial-5.6
Thu, 28 Jan 2021 18:48:40 +0800, by Anton Shestakov
tests: back out changeset 77b184ee60b5 mercurial-5.6
Thu, 28 Jan 2021 18:48:39 +0800, by Anton Shestakov
tests: back out changeset 38ab502ad94e mercurial-5.6
Thu, 28 Jan 2021 18:48:38 +0800, by Anton Shestakov
tests: back out changeset a4e50b74747e mercurial-5.6
Thu, 28 Jan 2021 18:48:37 +0800, by Anton Shestakov
tests: back out changeset 2238dd83c5b3 mercurial-5.6
Thu, 28 Jan 2021 18:48:37 +0800, by Anton Shestakov
tests: back out changeset b3d9e6c805d6 mercurial-5.6
Thu, 28 Jan 2021 18:48:36 +0800, by Anton Shestakov
test-compat: create a compatibility branch for Mercurial 5.6 mercurial-5.6
Sat, 30 Jan 2021 20:21:19 +0800, by Anton Shestakov
release: merge with stable stable
Mon, 01 Feb 2021 11:52:04 +0100, by Pierre-Yves David
Added tag 10.2.0.post1 for changeset eadc1d09f2f5 stable
Mon, 01 Feb 2021 11:51:00 +0100, by Pierre-Yves David
release: prepare a 10.2.0.post1 release stable 10.2.0.post1
Mon, 01 Feb 2021 11:50:43 +0100, by Pierre-Yves David
packaging: mark as developer version stable
Mon, 01 Feb 2021 14:44:43 +0800, by Anton Shestakov
Added tag 10.2.0 for changeset 35b883a4ff5a stable
Mon, 01 Feb 2021 14:44:05 +0800, by Anton Shestakov
packaging: update the debian changelog stable 10.2.0
Sun, 31 Jan 2021 17:08:40 +0800, by Anton Shestakov
changelog: update for evolve 10.2.0 stable
Sun, 31 Jan 2021 17:05:48 +0800, by Anton Shestakov
packaging: prepare evolve version 10.2.0 stable
Sun, 31 Jan 2021 17:11:03 +0800, by Anton Shestakov
branching: merge into stable in preparation for release stable
Sat, 30 Jan 2021 20:20:23 +0800, by Anton Shestakov
branching: merge stable into default
Sat, 30 Jan 2021 20:20:21 +0800, by Anton Shestakov
compat: make enforcesinglehead() compatible with hg <= 5.1 again stable
Fri, 29 Jan 2021 19:23:47 +0800, by Anton Shestakov
compat: fix format_changeset_summary_fn() for hg <= 5.6
Thu, 28 Jan 2021 18:29:53 +0800, by Anton Shestakov
changelog: update for 10.1.1 stable
Wed, 27 Jan 2021 18:10:27 +0800, by Anton Shestakov
changelog: update for 10.2.0
Wed, 27 Jan 2021 18:03:44 +0800, by Anton Shestakov
branching: merge with stable
Tue, 26 Jan 2021 17:14:29 +0100, by Pierre-Yves David
divergence-resolution: deal with simple "just one moved case" earlier
Fri, 22 Jan 2021 05:37:43 +0100, by Sushil khanchi
divergence-resolution: remove explicite hash in some command
Fri, 22 Jan 2021 04:54:51 +0100, by Pierre-Yves David
divergence-resolution: clarify some test case
Fri, 22 Jan 2021 04:24:05 +0100, by Pierre-Yves David
divergence-resolution: pass the base changeset to _pickresolutionparent
Fri, 22 Jan 2021 04:10:44 +0100, by Pierre-Yves David
divergence-resolution: pre-indent some code
Fri, 22 Jan 2021 03:59:49 +0100, by Pierre-Yves David
divergence-resolution: return rev from _pickresolutionparent()
Thu, 22 Oct 2020 21:12:50 +0530, by Sushil khanchi
doc: update MQ To Evolve refugee book stable
Wed, 30 Dec 2020 11:01:37 -0800, by Chuck Tuffli
doc: fix build warning for index.rst stable
Wed, 30 Dec 2020 11:15:01 -0800, by Chuck Tuffli
branching: merge stable into default
Fri, 22 Jan 2021 11:04:55 +0100, by Pierre-Yves David
cleanup: ensure log and output messages have a '\n' terminator stable
Thu, 21 Jan 2021 15:01:19 -0500, by Matt Harbison
tests: update exit code for command errors stable
Wed, 20 Jan 2021 14:47:22 +0800, by Anton Shestakov
tests: update exit code when non-existent help section requested stable
Wed, 20 Jan 2021 14:45:30 +0800, by Anton Shestakov
tests: update exit code in case of push failing because it'd create new heads stable
Wed, 23 Dec 2020 21:34:22 +0800, by Anton Shestakov
tests: update exit code in case of revset parse errors stable
Wed, 02 Dec 2020 10:06:22 +0800, by Anton Shestakov
tests: update exit code in case of unresolved merge conflicts stable
Wed, 02 Dec 2020 09:55:33 +0800, by Anton Shestakov
tests: update with more detailed exit codes stable
Thu, 26 Nov 2020 14:26:40 +0800, by Anton Shestakov
tests: update with more detailed exit codes stable
Thu, 19 Nov 2020 08:28:45 -0800, by Martin von Zweigbergk
tests: remove branch cache entries from test-discovery-obshashrange.t stable
Thu, 21 Jan 2021 19:05:17 +0800, by Anton Shestakov
tests: update branch cache writes in blackbox output stable
Thu, 21 Jan 2021 11:21:04 +0800, by Anton Shestakov
compat: handle change to enforcesinglehead() signature stable
Sun, 13 Dec 2020 09:46:16 -0800, by Martin von Zweigbergk
tests: make sure test-prev-next.t hits lock warning timeout every time stable
Tue, 08 Dec 2020 11:58:34 +0800, by Anton Shestakov
tests: remove trailing "!" from abort messages stable
Wed, 02 Dec 2020 09:40:33 +0800, by Anton Shestakov
compat: wrap debugstrip from core hg if it exists stable
Wed, 25 Nov 2020 13:50:37 +0100, by Anton Shestakov
compat: make topics compatible across change to cmdutil.commitstatus() stable
Mon, 16 Nov 2020 13:08:08 -0800, by Martin von Zweigbergk
tests: rebase now produces different "one-line summary" output stable
Thu, 29 Oct 2020 09:19:37 -0700, by Martin von Zweigbergk
tests: remove branch cache entries from test-discovery-obshashrange.t
Thu, 21 Jan 2021 19:05:17 +0800, by Anton Shestakov
tests: update branch cache writes in blackbox output
Thu, 21 Jan 2021 11:21:04 +0800, by Anton Shestakov
tests: update exit code for command errors
Wed, 20 Jan 2021 14:47:22 +0800, by Anton Shestakov
tests: update exit code when non-existent help section requested
Wed, 20 Jan 2021 14:45:30 +0800, by Anton Shestakov
topic: fix the newly added cache for repository without topic
Wed, 23 Dec 2020 23:54:25 +0100, by Pierre-Yves David
evolve: typo in pstatus and pdiff docstring
Tue, 12 Jan 2021 02:03:43 +0800, by Anton Shestakov
evolve: import mercurial.node as nodemod
Mon, 11 Jan 2021 00:23:40 +0800, by Anton Shestakov
topic: remove unused _orderrevs()
Mon, 11 Jan 2021 00:20:27 +0800, by Anton Shestakov
prevnext: respect command-templates.oneline-summary if configured
Fri, 30 Oct 2020 13:42:33 -0700, by Martin von Zweigbergk
touch: respect command-templates.oneline-summary if configured
Fri, 30 Oct 2020 13:43:02 -0700, by Martin von Zweigbergk
evolve: respect command-templates.oneline-summary if configured
Fri, 30 Oct 2020 13:42:51 -0700, by Martin von Zweigbergk
evolve: make the `displayer` we pass around just a function
Thu, 29 Oct 2020 15:11:20 -0700, by Martin von Zweigbergk
evolvecmd: delete dead assignment to `displayer`
Thu, 29 Oct 2020 14:14:00 -0700, by Martin von Zweigbergk
evolvecmd: remove unnecessary default value for commitmsg when relocating
Thu, 15 Oct 2020 15:28:23 -0700, by Martin von Zweigbergk
evolve: remove spurious "working directory is now at ..." messages stable
Tue, 24 Nov 2020 18:04:40 -0800, by Martin von Zweigbergk
changelog: document the workaround committed in b1e057fb7837 stable
Thu, 24 Dec 2020 00:52:06 +0100, by Pierre-Yves David
formatting: fix the number of black line stable
Thu, 24 Dec 2020 00:50:19 +0100, by Pierre-Yves David
topic: disable inmemory rebase to avoid losing the topic stable
Tue, 22 Dec 2020 20:22:41 -0500, by Matt Harbison
topic: look for topic heads only when necessary
Tue, 01 Dec 2020 00:56:39 +0530, by Sushil khanchi
topic: a test to demonstrate a bug in branchheads()
Tue, 01 Dec 2020 00:30:45 +0530, by Sushil khanchi
topic: wrap branch call during summary
Wed, 23 Dec 2020 13:50:23 +0100, by Pierre-Yves David
topic: also wrap the `ctx.branch` of parents
Wed, 23 Dec 2020 13:49:45 +0100, by Pierre-Yves David
topic: extract awful `ctx.branch` hijacking used in discovery
Wed, 23 Dec 2020 13:36:02 +0100, by Pierre-Yves David
tests: update exit code in case of push failing because it'd create new heads
Wed, 23 Dec 2020 21:34:22 +0800, by Anton Shestakov
branching: merge with stable
Wed, 16 Dec 2020 16:23:52 +0100, by Pierre-Yves David
topic: add a basic in-memory cache for topic information
Sun, 13 Dec 2020 14:48:28 +0100, by Pierre-Yves David
head-checking: micro-optimize _filter_obsolete_heads
Tue, 01 Dec 2020 21:05:53 +0100, by Georges Racinet
heptapod-ci: new address for the evolve-doc base image stable
Fri, 20 Nov 2020 21:38:48 +0100, by Georges Racinet
heptapod-ci: new address for base Docker images stable
Fri, 20 Nov 2020 21:32:38 +0100, by Georges Racinet
compat: handle change to enforcesinglehead() signature
Sun, 13 Dec 2020 09:46:16 -0800, by Martin von Zweigbergk
tests: make sure test-prev-next.t hits lock warning timeout every time
Tue, 08 Dec 2020 11:58:34 +0800, by Anton Shestakov
tests: update exit code in case of revset parse errors
Wed, 02 Dec 2020 10:06:22 +0800, by Anton Shestakov
tests: update exit code in case of unresolved merge conflicts
Wed, 02 Dec 2020 09:55:33 +0800, by Anton Shestakov
tests: remove trailing "!" from abort messages
Wed, 02 Dec 2020 09:40:33 +0800, by Anton Shestakov
strip: remove experimental.prunestrip option
Fri, 27 Nov 2020 09:47:01 +0800, by Anton Shestakov
branching: merge with stable into default
Thu, 26 Nov 2020 07:40:10 +0100, by Pierre-Yves David
tests: update with more detailed exit codes
Thu, 26 Nov 2020 14:26:40 +0800, by Anton Shestakov
tests: use debugstrip core command for testing prunestrip
Thu, 26 Nov 2020 09:56:26 +0800, by Anton Shestakov
compat: wrap debugstrip from core hg if it exists
Wed, 25 Nov 2020 13:50:37 +0100, by Anton Shestakov
tests: update with more detailed exit codes
Thu, 19 Nov 2020 08:28:45 -0800, by Martin von Zweigbergk
compat: make topics compatible across change to cmdutil.commitstatus()
Mon, 16 Nov 2020 13:08:08 -0800, by Martin von Zweigbergk
test2rst: minor improvements stable
Mon, 23 Nov 2020 13:43:29 +0800, by Anton Shestakov
packaging: run sphinx on py3 by default stable
Wed, 11 Nov 2020 18:34:15 +0800, by Anton Shestakov
docs: build using py3 image stable
Sun, 23 Aug 2020 10:09:44 +0800, by Anton Shestakov
docs: make docs/conf.py compatible with Python 3 stable
Mon, 06 Jul 2020 00:17:44 +0800, by Anton Shestakov
test2rst: use python3 stable
Mon, 09 Nov 2020 23:10:06 +0800, by Anton Shestakov
test2rst: now that we don't use directory mode, remove it too stable
Mon, 09 Nov 2020 23:08:15 +0800, by Anton Shestakov
packaging: use automatic variables for running test2rst.py stable
Mon, 09 Nov 2020 22:37:05 +0800, by Anton Shestakov
test2rst: remove the abandoned index building part stable
Mon, 09 Nov 2020 23:03:31 +0800, by Anton Shestakov
test2rst: make one_file() useful stable
Mon, 09 Nov 2020 22:58:37 +0800, by Anton Shestakov
docs: properly capitalize LANG value stable
Sun, 23 Aug 2020 09:36:36 +0800, by Anton Shestakov
docs: refactor docs/conf.py a bit stable
Mon, 06 Jul 2020 00:17:16 +0800, by Anton Shestakov
tests: add a new test-check-tag.t to test releases stable
Thu, 12 Nov 2020 13:37:35 +0800, by Anton Shestakov
tests: update the experimental.evolution=all comment stable
Wed, 11 Nov 2020 19:03:34 +0800, by Anton Shestakov
tests: move experimental.evolution=all config option closer to the comment stable
Wed, 11 Nov 2020 19:01:35 +0800, by Anton Shestakov
tests: require repo in test-check-debian.t stable
Wed, 11 Nov 2020 18:56:37 +0800, by Anton Shestakov
tests: update comment in test-check-flake8.t stable
Wed, 11 Nov 2020 18:50:40 +0800, by Anton Shestakov
tests: update comment in test-check-pyflakes.t stable
Wed, 11 Nov 2020 18:48:56 +0800, by Anton Shestakov
tests: rebase now produces different "one-line summary" output
Thu, 29 Oct 2020 09:19:37 -0700, by Martin von Zweigbergk
branching: merge stable into default
Sat, 31 Oct 2020 18:51:09 +0100, by Pierre-Yves David
packaging: update the debian changelog stable
Sat, 31 Oct 2020 18:42:25 +0100, by Pierre-Yves David
packaging: mark as developer version stable
Sat, 31 Oct 2020 20:28:42 +0800, by Anton Shestakov
Added tag 10.1.0 for changeset 782cbadb123f stable
Sat, 31 Oct 2020 20:27:10 +0800, by Anton Shestakov
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sat, 31 Oct 2020 20:21:12 +0800, by Anton Shestakov
tests: back out changeset ba8bc1b0acd2 mercurial-4.7
Sat, 31 Oct 2020 20:13:46 +0800, by Anton Shestakov
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Sat, 31 Oct 2020 20:02:03 +0800, by Anton Shestakov
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sat, 31 Oct 2020 19:43:46 +0800, by Anton Shestakov
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
Sat, 31 Oct 2020 19:38:46 +0800, by Anton Shestakov
test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Sat, 31 Oct 2020 19:33:42 +0800, by Anton Shestakov
test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1
Sat, 31 Oct 2020 19:10:55 +0800, by Anton Shestakov
test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2
Sat, 31 Oct 2020 19:05:48 +0800, by Anton Shestakov
tests: adjust test output after b2de5825e5ca for older Mercurial mercurial-5.3
Sat, 31 Oct 2020 18:55:21 +0800, by Anton Shestakov
tests: back out changeset 028e4ea75456 mercurial-5.3
Sat, 31 Oct 2020 18:48:57 +0800, by Anton Shestakov
test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Sat, 31 Oct 2020 18:37:12 +0800, by Anton Shestakov
test-compat: merge mercurial-5.5 into mercurial-5.4 mercurial-5.4
Sat, 31 Oct 2020 18:31:11 +0800, by Anton Shestakov
tests: back out changeset 0d5c344c0ba4 mercurial-5.5
Sat, 31 Oct 2020 18:11:27 +0800, by Anton Shestakov
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

less more | rev 5766: (0) -3000 -1000 -240 +240 +1000 tip

Mercurial > evolve

graph