evolve: revision graph

graph

less more | rev 5927: (0) -3000 -1000 -480 +480 +1000 tip

tests: add simple auto-publish checks alongside publish-bare-branch checks stable
Wed, 19 May 2021 09:59:53 +0800, by Anton Shestakov
divergence-resolution: use last evolution date to choose p1 when merging
Wed, 03 Mar 2021 12:40:59 +0530, by Sushil khanchi
split: adjust "no more change to split" to use plural form
Mon, 17 May 2021 19:23:09 +0800, by Anton Shestakov
topic: add a 'topic.active' label to messages with active topic
Mon, 17 May 2021 19:22:34 +0800, by Anton Shestakov
evolve: add labels to messages about leaving and deleting bookmarks
Mon, 17 May 2021 19:19:32 +0800, by Anton Shestakov
topic: make two almost identical messages actually identical
Mon, 17 May 2021 19:11:06 +0800, by Anton Shestakov
evolve: drop quotes around node in a content divergence resolution message
Mon, 17 May 2021 19:10:22 +0800, by Anton Shestakov
topic: remove duplicate entry in the colortable
Mon, 17 May 2021 17:45:57 +0800, by Anton Shestakov
topic: don't lose any file changes when changing topic of a merge commit stable
Sun, 09 May 2021 00:10:55 +0800, by Anton Shestakov
tests: add test-amend-merge.t with a simple merge amended by various commands stable
Sun, 09 May 2021 00:09:53 +0800, by Anton Shestakov
next: refactor two if blocks into an if-elif block stable
Sat, 15 May 2021 20:40:19 +0800, by Anton Shestakov
tests: demonstrate current behavior of hg next with --merge and --evolve stable
Sat, 15 May 2021 20:27:53 +0800, by Anton Shestakov
changelog: mention hg next --abort
Sat, 15 May 2021 03:00:00 +0800, by Anton Shestakov
next: add an --abort flag
Sat, 15 May 2021 02:59:11 +0800, by Anton Shestakov
compat: add check_at_most_one_arg() and check_incompatible_arguments()
Sat, 15 May 2021 02:58:04 +0800, by Anton Shestakov
tests: remove unnecessary config from test-obsolete.t
Sun, 09 May 2021 20:02:01 +0800, by Anton Shestakov
tests: drop debugobsolete alias from common.sh
Sun, 09 May 2021 19:58:24 +0800, by Anton Shestakov
compat: make compatible with upstream change to put nullid on repo
Tue, 04 May 2021 09:39:45 -0700, by Martin von Zweigbergk
next: remove duplicated targets when updating from an unstable changeset stable
Sun, 02 May 2021 22:06:11 +0800, by Anton Shestakov
branching: merge with stable
Sun, 25 Apr 2021 23:52:29 +0800, by Anton Shestakov
packaging: mark as developer version stable
Sun, 25 Apr 2021 23:50:21 +0800, by Anton Shestakov
Added tag 10.3.1 for changeset 93dc3cb68842 stable
Sun, 25 Apr 2021 15:32:51 +0200, by Pierre-Yves David
packaging: prepare version 10.3.1 stable 10.3.1
Sun, 25 Apr 2021 14:13:51 +0800, by Anton Shestakov
changelog: update for evolve 10.3.1 and topic 0.22.1 stable
Sun, 25 Apr 2021 14:12:01 +0800, by Anton Shestakov
changelog: fix a couple of typos that got through stable
Fri, 12 Mar 2021 19:04:11 +0800, by Anton Shestakov
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sun, 25 Apr 2021 13:24:36 +0800, by Anton Shestakov
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Sun, 25 Apr 2021 13:21:56 +0800, by Anton Shestakov
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sun, 25 Apr 2021 13:18:03 +0800, by Anton Shestakov
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
Sun, 25 Apr 2021 13:13:02 +0800, by Anton Shestakov
test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Sat, 24 Apr 2021 21:34:57 +0800, by Anton Shestakov
test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1
Sat, 24 Apr 2021 21:24:54 +0800, by Anton Shestakov
test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2
Sat, 24 Apr 2021 21:13:21 +0800, by Anton Shestakov
test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Sat, 24 Apr 2021 21:08:47 +0800, by Anton Shestakov
test-compat: merge mercurial-5.5 into mercurial-5.4 mercurial-5.4
Sat, 24 Apr 2021 20:34:40 +0800, by Anton Shestakov
test-compat: merge mercurial-5.6 into mercurial-5.5 mercurial-5.5
Sat, 24 Apr 2021 20:27:44 +0800, by Anton Shestakov
test-compat: merge mercurial-5.7 into mercurial-5.6 mercurial-5.6
Sat, 24 Apr 2021 20:01:39 +0800, by Anton Shestakov
test-compat: back out changeset 5b804fec43be mercurial-5.7
Sat, 24 Apr 2021 19:54:14 +0800, by Anton Shestakov
test-compat: back out changeset 7e2d3952a730 mercurial-5.7
Sat, 24 Apr 2021 19:53:59 +0800, by Anton Shestakov
test-compat: back out changeset 1682b388be13 mercurial-5.7
Sat, 24 Apr 2021 19:53:12 +0800, by Anton Shestakov
test-compat: create a compatibility branch for Mercurial 5.7 mercurial-5.7
Sat, 24 Apr 2021 19:46:08 +0800, by Anton Shestakov
changelog: adjust the last changelog entry stable
Fri, 23 Apr 2021 13:05:18 +0200, by Pierre-Yves David
changelog: mention the cache fix stable
Fri, 23 Apr 2021 13:05:18 +0200, by Pierre-Yves David
changelog: mention the recent hg next fixes stable
Thu, 22 Apr 2021 21:08:50 +0800, by Anton Shestakov
next: treat targets that need evolution the same as regular targets stable
Thu, 22 Apr 2021 17:19:01 +0800, by Anton Shestakov
next: filter unstable targets by topic only when there's no --no-topic stable
Thu, 22 Apr 2021 17:18:37 +0800, by Anton Shestakov
next: drop safety net around getting --no-topic flag value stable
Wed, 21 Apr 2021 20:05:56 +0800, by Anton Shestakov
next: make `filtered` a set of revs, not contexts stable
Wed, 21 Apr 2021 19:51:00 +0800, by Anton Shestakov
next: make aspchildren filtering code work correctly stable
Wed, 21 Apr 2021 19:44:26 +0800, by Anton Shestakov
evolve: rename choosedrev to selectedrev because choosed is not a word stable
Wed, 21 Apr 2021 19:41:41 +0800, by Anton Shestakov
branching: merge with stable
Fri, 23 Apr 2021 11:55:42 +0200, by Pierre-Yves David
tests: more globbing on the copyright line stable
Thu, 22 Apr 2021 20:51:46 +0800, by Anton Shestakov
tests: drop rev-branch-cache bundle capability, it's no longer advertised stable
Fri, 12 Mar 2021 18:48:49 +0800, by Anton Shestakov
tests: update more exit codes in case conflicting changes stable
Thu, 04 Feb 2021 19:23:45 +0800, by Anton Shestakov
tests: update exit code for failed hooks stable
Thu, 04 Feb 2021 19:21:28 +0800, by Anton Shestakov
topic: compatibility for branchcache having a repo argument in 5.8 stable
Fri, 19 Mar 2021 16:23:24 +0800, by Anton Shestakov
evolve: check stablesortcache index size before unpacking (issue6354) stable
Tue, 13 Apr 2021 19:46:03 +0800, by Anton Shestakov
evolve: save cache in debugstablesortcache() stable
Tue, 13 Apr 2021 18:40:19 +0800, by Anton Shestakov
tests: clarify what repack.py is doing in test-cache-corruption.t stable
Tue, 13 Apr 2021 18:31:14 +0800, by Anton Shestakov
tests: now we can drop cache corruption checks from obshashrange tests stable
Mon, 05 Apr 2021 16:36:35 +0800, by Anton Shestakov
tests: add a separate test file to test cache corruption and recovery stable
Mon, 05 Apr 2021 16:35:47 +0800, by Anton Shestakov
compat: remove unused arraytobytes/arrayfrombytes stable
Fri, 02 Apr 2021 18:56:43 +0800, by Anton Shestakov
evolve: make stablesortcache.save/load use struct.unpack/pack (issue6354) stable
Wed, 31 Mar 2021 20:39:37 +0800, by Anton Shestakov
evolve: make firstmergecache.save/load use struct.unpack/pack (issue6354) stable
Tue, 30 Mar 2021 19:35:52 +0800, by Anton Shestakov
evolve: add debugfirstmergecache command to simply dump the contents stable
Wed, 31 Mar 2021 20:13:31 +0800, by Anton Shestakov
evolve: make depthcache.save/load use struct.unpack/pack (issue6354) stable
Tue, 30 Mar 2021 19:18:08 +0800, by Anton Shestakov
evolve: use nullrev for an empty cache key stable
Wed, 24 Mar 2021 22:07:07 +0800, by Anton Shestakov
tests: add some cache sanity checks based on already existing debug commands stable
Wed, 17 Mar 2021 20:19:41 +0800, by Anton Shestakov
tests: add a content check for evoext-* caches stable
Wed, 17 Mar 2021 14:48:13 +0800, by Anton Shestakov
branching: merge stable into default
Sun, 28 Mar 2021 10:20:34 +0200, by Pierre-Yves David
evolve: update some conditionals
Mon, 08 Mar 2021 01:12:02 +0530, by Sushil khanchi
public-content-divergence: early set the public one to local side
Mon, 08 Mar 2021 17:45:57 +0530, by Sushil khanchi
firstmergecache: fix a typo that prevented cache clearing in repo.destroyed() stable
Fri, 19 Mar 2021 15:52:00 +0800, by Anton Shestakov
evolve: use bytes for calling ui.write() in debugstablesortcache command stable
Wed, 17 Mar 2021 20:13:53 +0800, by Anton Shestakov
tests: cleanup in obshashrange tests stable
Tue, 16 Mar 2021 21:35:02 +0800, by Anton Shestakov
evolve: use cl.tiprev() instead of len(cl) - 1 stable
Tue, 16 Mar 2021 21:25:11 +0800, by Anton Shestakov
tests: a bunch of typos in test-discovery-obshashrange-cache.t stable
Mon, 15 Mar 2021 19:21:23 +0800, by Anton Shestakov
tests: simplify character sorting script stable
Mon, 15 Mar 2021 18:45:18 +0800, by Anton Shestakov
evolve: remove pointless ternary operator stable
Sun, 14 Mar 2021 16:56:16 +0800, by Anton Shestakov
evolve: import mercurial.i18n._ first stable
Sun, 14 Mar 2021 16:50:49 +0800, by Anton Shestakov
evolve: use correct unit for cache building progress stable
Sun, 14 Mar 2021 16:48:41 +0800, by Anton Shestakov
topic: compatibility for branchcache having a repo argument in 5.8
Fri, 19 Mar 2021 16:23:24 +0800, by Anton Shestakov
make: default to using python3 stable
Fri, 12 Mar 2021 11:05:20 +0100, by Pierre-Yves David
changelog: fix a couple of typos that got through
Fri, 12 Mar 2021 19:04:11 +0800, by Anton Shestakov
tests: drop rev-branch-cache bundle capability, it's no longer advertised
Fri, 12 Mar 2021 18:48:49 +0800, by Anton Shestakov
branching: merge with the wrong head
Fri, 12 Mar 2021 11:13:16 +0100, by Pierre-Yves David
branching: redo the stable->default merge (preserving test changes on default)
Fri, 12 Mar 2021 18:07:48 +0800, by Anton Shestakov
branching: merge stable into default (preserving test changes on default)
Thu, 11 Mar 2021 19:06:38 +0800, by Anton Shestakov
packaging: mark as developer version stable
Thu, 11 Mar 2021 18:56:59 +0800, by Anton Shestakov
Added tag 10.3.0 for changeset c0ed8e574638 stable
Thu, 11 Mar 2021 18:47:55 +0800, by Anton Shestakov
ci: build sdist tarball as a post step (only for tagged revisions) stable 10.3.0
Thu, 11 Mar 2021 17:14:09 +0800, by Anton Shestakov
packaging: prepare evolve version 10.3.0 stable
Thu, 11 Mar 2021 18:32:58 +0800, by Anton Shestakov
packaging: update the debian changelog stable
Thu, 11 Mar 2021 18:32:11 +0800, by Anton Shestakov
changelog: update for evolve 10.3.0 stable
Thu, 11 Mar 2021 18:31:51 +0800, by Anton Shestakov
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Thu, 11 Mar 2021 14:49:22 +0800, by Anton Shestakov
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Thu, 11 Mar 2021 14:48:12 +0800, by Anton Shestakov
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Thu, 11 Mar 2021 14:42:51 +0800, by Anton Shestakov
test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
Thu, 11 Mar 2021 14:32:26 +0800, by Anton Shestakov
test-compat: merge mercurial-5.1 into mercurial-5.0 mercurial-5.0
Thu, 11 Mar 2021 14:22:45 +0800, by Anton Shestakov
test-compat: merge mercurial-5.2 into mercurial-5.1 mercurial-5.1
Thu, 11 Mar 2021 14:07:39 +0800, by Anton Shestakov
test-compat: merge mercurial-5.3 into mercurial-5.2 mercurial-5.2
Thu, 11 Mar 2021 13:36:30 +0800, by Anton Shestakov
test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Thu, 11 Mar 2021 13:27:18 +0800, by Anton Shestakov
test-compat: merge mercurial-5.5 into mercurial-5.4 mercurial-5.4
Thu, 11 Mar 2021 13:18:30 +0800, by Anton Shestakov
tests: remove in-memory evolve cases (not supported prior to 5.6) mercurial-5.5
Thu, 11 Mar 2021 12:51:00 +0800, by Anton Shestakov
test-compat: merge mercurial-5.6 into mercurial-5.5 mercurial-5.5
Thu, 11 Mar 2021 12:40:20 +0800, by Anton Shestakov
test-compat: merge stable into mercurial-5.6 mercurial-5.6
Thu, 11 Mar 2021 12:29:50 +0800, by Anton Shestakov
test-compat: back out changeset ab2c56cdfc19 stable
Thu, 11 Mar 2021 12:06:42 +0800, by Anton Shestakov
test-compat: back out changeset ad80552c706c stable
Thu, 11 Mar 2021 12:06:41 +0800, by Anton Shestakov
branching: merge into stable in preparation for release stable
Thu, 11 Mar 2021 11:49:34 +0800, by Anton Shestakov
evolve: check if in-memory is supported on a good enough level for evolve
Tue, 09 Mar 2021 18:50:10 +0800, by Anton Shestakov
divergence-resolution: update some comments
Tue, 02 Feb 2021 00:05:19 +0530, by Sushil khanchi
evolve: drop unnecessary variables (follow-up of a9ad01ed1539)
Mon, 01 Feb 2021 23:56:34 +0530, by Sushil khanchi
tests: remove some unnecessary config
Wed, 03 Mar 2021 10:57:09 +0800, by Anton Shestakov
changelog: move a recently added feature to the correct release
Thu, 04 Mar 2021 09:12:41 +0800, by Anton Shestakov
changelog: reorder items, spelling
Thu, 04 Mar 2021 09:12:04 +0800, by Anton Shestakov
changelog: fix indent
Wed, 03 Mar 2021 11:08:13 +0800, by Anton Shestakov
evolve: add CHANGELOG entry
Sat, 05 Sep 2020 09:24:33 +0530, by Sushil khanchi
evolve: preserve wdir when using --stop
Wed, 26 Aug 2020 23:27:17 +0530, by Sushil khanchi
evolve: update a couple of comments in the recently created revset.py
Mon, 01 Mar 2021 19:22:33 +0800, by Anton Shestakov
evolve: add a compat comment to unstable() revset predicate
Mon, 01 Mar 2021 19:21:54 +0800, by Anton Shestakov
evolve: document provided revset predicates
Sat, 27 Feb 2021 19:13:04 +0800, by Anton Shestakov
evolve: split revsets into its own separate revset.py
Sat, 27 Feb 2021 18:22:12 +0800, by Anton Shestakov
evolve: rearrange some imports
Sat, 27 Feb 2021 18:07:27 +0800, by Anton Shestakov
evolve: remove hg 3.8 check
Sat, 27 Feb 2021 18:02:03 +0800, by Anton Shestakov
branching: merge with stable
Sat, 27 Feb 2021 12:04:24 +0100, by Pierre-Yves David
tests: add underlines to test-rewind.t
Tue, 23 Feb 2021 18:34:07 +0800, by Anton Shestakov
rewind: abort if some parts of a fold are unknown locally
Tue, 22 Dec 2020 19:07:46 +0800, by Anton Shestakov
rewind: abort when trying to rewind to multiple unrelated predecessors
Tue, 22 Dec 2020 19:06:36 +0800, by Anton Shestakov
rewind: walk obsmarkers and add more targets to rewind to
Tue, 22 Dec 2020 19:03:59 +0800, by Anton Shestakov
tests: make test-check-sdist.t less flaky by first archiving the repo
Thu, 18 Feb 2021 07:39:38 +0800, by Anton Shestakov
doc: change topic phrase 'disappear' to 'fade out' stable
Wed, 24 Feb 2021 14:30:21 -0800, by Chuck Tuffli
doc: document stack as a substitue for MQ's qseries stable
Fri, 12 Feb 2021 13:16:01 -0800, by Chuck Tuffli
evolve: document experimental.evolution.in-memory in extension
Mon, 22 Feb 2021 15:34:15 -0800, by Martin von Zweigbergk
changelog: mention new experimental.evolution.in-memory config
Mon, 22 Feb 2021 12:56:39 -0800, by Martin von Zweigbergk
obslog: correct help to state that obslog is the command name
Tue, 23 Feb 2021 13:31:24 -0800, by Kyle Lippincott
evolve: use nodemod.short() instead of nodemod.hex()[:12]
Tue, 23 Feb 2021 06:36:46 +0800, by Anton Shestakov
evolve: rely on ctx.__bytes__() for formatting instead of using ctx.hex()[:12]
Tue, 23 Feb 2021 06:31:01 +0800, by Anton Shestakov
pstatus: drop unnecessary CLI options
Tue, 23 Feb 2021 06:06:06 +0800, by Anton Shestakov
pdiff: drop unnecessary CLI options
Wed, 17 Feb 2021 15:37:14 +0530, by Sushil khanchi
changelog: add an entry aboutt improved divergence resolution
Mon, 22 Feb 2021 17:37:53 +0100, by Pierre-Yves David
divergence-resolution: [patch 3] fix a messed up test case
Sun, 24 Jan 2021 20:09:28 +0530, by Pierre-Yves David
divergence-resolution: [patch 2] fix a messed up test case
Sun, 24 Jan 2021 20:09:02 +0530, by Pierre-Yves David
divergence-resolution: [patch 1] fix a messed up test case
Sun, 24 Jan 2021 19:47:17 +0530, by Pierre-Yves David
divergence-resolution: drop a block of code which is unnecessary now
Wed, 17 Feb 2021 18:11:44 +0530, by Sushil khanchi
divergence-resolution: add support and doc for a special case in divergence
Thu, 18 Feb 2021 23:37:41 +0530, by Sushil khanchi
divergence-resolution: add comments to explain a particular case
Mon, 01 Feb 2021 23:54:53 +0530, by Sushil khanchi
divergence-resolution: take parent successors in account
Fri, 22 Jan 2021 05:37:43 +0100, by Sushil khanchi
divergence-resolution: add a buggy test case for resolution
Thu, 28 Jan 2021 13:40:36 +0530, by Sushil khanchi
doc: switch rst `=` section underlines to `-`
Wed, 17 Feb 2021 14:00:43 -0800, by Kyle Lippincott
doc: remove .strip() for a docstring
Wed, 17 Feb 2021 12:00:45 -0800, by Kyle Lippincott
evolvecmd: don't update working copy when using in-memory merge
Tue, 24 Nov 2020 16:33:24 -0800, by Martin von Zweigbergk
evolve: when relocating, optionally first try to do it using in-memory merge
Thu, 15 Oct 2020 15:40:36 -0700, by Martin von Zweigbergk
tests: add test for in-memory evolve, not actually in-memory yet
Thu, 01 Oct 2020 12:34:36 -0700, by Martin von Zweigbergk
evolvecmd: extract function for rewriting hashes in commit message
Thu, 15 Oct 2020 15:16:36 -0700, by Martin von Zweigbergk
branching: merge stable into default
Tue, 09 Feb 2021 19:11:39 +0800, by Anton Shestakov
tests: fix spelling in test-topic-stack.t stable
Wed, 03 Feb 2021 08:07:10 -0800, by Chuck Tuffli
tests: add test-check-sdist.t to check setup.py sdist results stable
Mon, 08 Feb 2021 16:31:35 +0800, by Anton Shestakov
manifest: use a regular relative path for excluding legacy.py stable
Mon, 01 Feb 2021 19:57:33 +0800, by Anton Shestakov
manifest: include all .py files from hgext3rd stable
Mon, 01 Feb 2021 19:52:39 +0800, by Anton Shestakov
tests: update more exit codes in case conflicting changes
Thu, 04 Feb 2021 19:23:45 +0800, by Anton Shestakov
tests: update exit code for failed hooks
Thu, 04 Feb 2021 19:21:28 +0800, by Anton Shestakov
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sun, 31 Jan 2021 16:46:17 +0800, by Anton Shestakov
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
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
test-compat: merge mercurial-5.4 into mercurial-5.3 mercurial-5.3
Fri, 31 Jul 2020 18:16:04 +0800, by Anton Shestakov
test-compat: back out changeset 0d65a5e96691 mercurial-5.4
Fri, 31 Jul 2020 18:09:18 +0800, by Anton Shestakov
test-compat: back out changeset 58b0dfc6dd52 mercurial-5.4
Fri, 31 Jul 2020 18:03:43 +0800, by Anton Shestakov
test-compat: create a new compatibility branch mercurial-5.4 mercurial-5.4
Fri, 31 Jul 2020 17:39:00 +0800, by Anton Shestakov
packaging: mark as developer version stable
Fri, 31 Jul 2020 20:00:57 +0800, by Anton Shestakov
Added tag 10.0.1 for changeset fb543438704b stable
Fri, 31 Jul 2020 19:58:41 +0800, by Anton Shestakov
packaging: prepare version 10.0.1 stable 10.0.1
Fri, 31 Jul 2020 19:56:37 +0800, by Anton Shestakov
topic: substitute current topic when `--topic .` is used for outgoing/push stable
Fri, 12 Jun 2020 15:42:43 +0800, by Anton Shestakov
topic: treat argument to --topic as a literal topic name explicitly stable
Thu, 11 Jun 2020 18:50:29 +0800, by Anton Shestakov
changelog: update for evolve 10.1.0
Mon, 27 Jul 2020 13:11:55 +0800, by Anton Shestakov
changelog: update for evolve 10.0.1 stable
Mon, 27 Jul 2020 12:53:53 +0800, by Anton Shestakov
tests: remove unnecessary command flags from test-rewind.t
Wed, 03 Jun 2020 18:47:23 +0800, by Anton Shestakov
tests: shorten and simplify global setup section in test-rewind.t
Wed, 03 Jun 2020 16:56:06 +0800, by Anton Shestakov
tests: move hg clone above case description in test-rewind.t
Wed, 03 Jun 2020 16:28:33 +0800, by Anton Shestakov

less more | rev 5927: (0) -3000 -1000 -480 +480 +1000 tip

Mercurial > evolve

graph