| Sat, 31 Oct 2020 02:34:31 +0800 |
Anton Shestakov |
changelog: update for 10.1.0
|
| Wed, 28 Oct 2020 20:24:26 +0100 |
Pierre-Yves David |
branching: merge stable into default
|
| Sat, 19 Sep 2020 17:49:31 +0200 |
Anton Shestakov |
evolve: clean merge state when content divergence resolution has no changes
stable
|
| Fri, 08 May 2020 19:49:07 +0800 |
Anton Shestakov |
test-compat: back out changeset 591a0afd2ef3
stable
|
| Fri, 08 May 2020 19:22:36 +0800 |
Anton Shestakov |
test-compat: back out changeset 4da1d21231ae
stable
|
| Fri, 09 Oct 2020 08:39:15 -0700 |
Martin von Zweigbergk |
tests: {successorssets} now always return a list, affecting json output
stable
|
| Fri, 02 Oct 2020 10:09:14 -0700 |
Martin von Zweigbergk |
compat: add implementations of new merge.update() and merge.clean_update()
stable
|
| Fri, 02 Oct 2020 09:51:45 -0700 |
Martin von Zweigbergk |
compat: rename update() to _update() to make room for a new update()
stable
|
| Sun, 25 Oct 2020 21:38:37 +0800 |
Anton Shestakov |
tests: use appropriate Python (2 or 3) for json.tool
|
| Sat, 24 Oct 2020 23:55:15 +0800 |
Anton Shestakov |
tests: use appropriate Python (2 or 3) for random-revs.py
|
| Sat, 24 Oct 2020 23:47:01 +0800 |
Anton Shestakov |
tests: move ad-hoc random_rev.py to testlib/random-revs.py
|
| Sat, 24 Oct 2020 23:26:41 +0800 |
Anton Shestakov |
tests: use appropriate Python (2 or 3) for md5sum.py
|
| Mon, 26 Oct 2020 18:32:22 +0100 |
Pierre-Yves David |
test-compat: create a new compatibility branch mercurial-5.5
mercurial-5.5
|
| Fri, 25 Sep 2020 09:13:57 -0700 |
Martin von Zweigbergk |
compat: add support for upstream rename of merge.update() to _update()
stable
|
| Wed, 14 Oct 2020 12:10:05 +0200 |
Sushil khanchi |
unstable-list: add an item about author divergence resolution
|
| Wed, 14 Oct 2020 12:09:41 +0200 |
Sushil khanchi |
unstable-list: add an item about divergence on changeset description
|
| Wed, 14 Oct 2020 12:09:15 +0200 |
Sushil khanchi |
unstable-list: add an item for solving named branch divergence
|
| Tue, 20 Oct 2020 10:33:46 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Mon, 12 Oct 2020 12:33:18 +0200 |
Sietse Brouwer |
ngtip: make revset help text slightly more descriptive
stable
|
| Wed, 07 Oct 2020 09:34:59 +0200 |
Sietse Brouwer |
ngtip: fix TypeError: make revset from revs, not nodes (issue6405)
stable
|
| Wed, 14 Oct 2020 15:48:37 +0200 |
Pierre-Yves David |
topic: add a `exp….topic.linear-merge` option to allow some oedipus
|
| Thu, 15 Oct 2020 19:46:38 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Sun, 11 Oct 2020 20:50:02 +0800 |
Anton Shestakov |
rewind: actually track folds using fold-* metadata in obsmarkers
|
| Mon, 12 Oct 2020 12:09:39 +0200 |
Sietse Brouwer |
readme: fix syntax of format-source link
stable
|
| Fri, 25 Sep 2020 21:47:30 -0700 |
Martin von Zweigbergk |
evolvecmd: move bookmark-deactivation out of _relocatecommit()
|
| Fri, 25 Sep 2020 15:28:17 -0700 |
Martin von Zweigbergk |
evolve: deactivate bookmark before updating to destination
|
| Fri, 25 Sep 2020 13:31:41 -0700 |
Martin von Zweigbergk |
evolvecmd: inline _evolvemerge() into _relocatecommit()
|
| Fri, 25 Sep 2020 13:12:57 -0700 |
Martin von Zweigbergk |
evolvecmd: reorder some functions to match order they're called
|
| Thu, 24 Sep 2020 16:54:13 -0700 |
Martin von Zweigbergk |
evolvecmd: rename `r` to usual `stats`
|
| Thu, 24 Sep 2020 16:34:04 -0700 |
Martin von Zweigbergk |
evolvecmd: simplify code for moving bookmarks when relocating node
|
| Thu, 24 Sep 2020 16:15:58 -0700 |
Martin von Zweigbergk |
evolvecmd: delete bookmark-handling code obsolete since move away from rebase
|
| Thu, 24 Sep 2020 15:33:01 -0700 |
Martin von Zweigbergk |
evolvecmd: rename _solveunstable() to _solveorphan()
|
| Wed, 14 Oct 2020 12:08:23 +0200 |
Sushil khanchi |
unstable-list: add "merging metadata" section for content-divergence
|
| Sat, 10 Oct 2020 22:44:24 +0530 |
Sushil khanchi |
unstable-list: add split and fold in content-divergence resolution
|
| Tue, 22 Sep 2020 13:50:45 +0530 |
Sushil khanchi |
unstable-list: add "merging files" section for content-divergence
|
| Tue, 22 Sep 2020 13:50:06 +0530 |
Sushil khanchi |
unstable-list: add "finding the resolution parent" section
|
| Tue, 22 Sep 2020 13:49:10 +0530 |
Sushil khanchi |
unstable-list: add a "details of resolution" section for content-divergence
|
| Sat, 10 Oct 2020 14:04:11 +0530 |
Sushil khanchi |
unstable-list: add new subsections for orphan when parent is pruned
|
| Sat, 10 Oct 2020 14:04:02 +0530 |
Sushil khanchi |
unstable-list: some minor updates
|
| Fri, 09 Oct 2020 08:39:15 -0700 |
Martin von Zweigbergk |
tests: {successorssets} now always return a list, affecting json output
|
| Thu, 17 Sep 2020 14:11:38 -0400 |
Matt Harbison |
discovery: list the new heads like core does when failing a multi-head push
|
| Fri, 21 Aug 2020 18:05:37 +0530 |
Sushil khanchi |
evolve: remove trailing white spaces
|
| Fri, 21 Aug 2020 18:04:48 +0530 |
Sushil khanchi |
evolve: refactor some error raising logic in content-divergence
|
| Fri, 21 Aug 2020 16:22:24 +0530 |
Sushil khanchi |
evolve: update public content divergence acc. to new behavior
|
| Fri, 21 Aug 2020 01:28:33 +0530 |
Sushil khanchi |
evolve: move a line a code block above
|
| Fri, 21 Aug 2020 01:27:58 +0530 |
Sushil khanchi |
evolve: rename a func and some updates around it
|
| Thu, 20 Aug 2020 23:54:27 +0530 |
Sushil khanchi |
evolve: update some comments
|
| Fri, 21 Aug 2020 01:04:08 +0530 |
Sushil khanchi |
evolve: no need to return divergent and other
|
| Fri, 21 Aug 2020 00:56:24 +0530 |
Sushil khanchi |
evolve: remove an evolvestate which is no more required
|
| Sun, 20 Sep 2020 09:22:04 +0530 |
Sushil khanchi |
evolve: remove swapping nodes logic while resolving divergence
|
| Fri, 25 Sep 2020 11:06:46 -0700 |
Martin von Zweigbergk |
evolve: don't set evolved node as dirstate p2
|
| Thu, 17 Sep 2020 21:19:13 +0200 |
Pierre-Yves David |
changelog: mention `hg rewind --dry-run`
|
| Tue, 22 Sep 2020 13:43:41 +0530 |
Sushil khanchi |
evolve: update docstring for mergeusers()
|
| Fri, 02 Oct 2020 10:09:14 -0700 |
Martin von Zweigbergk |
compat: add implementations of new merge.update() and merge.clean_update()
|
| Fri, 02 Oct 2020 09:51:45 -0700 |
Martin von Zweigbergk |
compat: rename update() to _update() to make room for a new update()
|
| Fri, 25 Sep 2020 09:13:57 -0700 |
Martin von Zweigbergk |
compat: add support for upstream rename of merge.update() to _update()
|
| Thu, 17 Sep 2020 23:41:14 -0400 |
Matt Harbison |
tests: conditonalize a Windows only output in test-evolve-progress.t
stable
|
| Sat, 19 Sep 2020 17:56:01 +0200 |
Pierre-Yves David |
ci: drop extraneous space
|
| Thu, 20 Aug 2020 17:32:22 +0530 |
Sushil khanchi |
evolve: resolutionparent should be succs of otherp1
|
| Thu, 13 Aug 2020 18:10:51 +0530 |
Sushil khanchi |
evolve: handle preparation logic for public divergence in one block
|
| Thu, 13 Aug 2020 17:22:19 +0530 |
Sushil khanchi |
evolve: add logic to decide local and other side before merge
|
| Wed, 05 Aug 2020 14:25:29 +0530 |
Sushil khanchi |
evolve: add some initial values in evolvestate
|
| Wed, 05 Aug 2020 14:19:29 +0530 |
Sushil khanchi |
evolve: move initial evolvestate values to main function
|
| Mon, 31 Aug 2020 15:35:31 +0530 |
Sushil khanchi |
evolve: set other side of public content div using mutability
|
| Mon, 31 Aug 2020 15:34:12 +0530 |
Sushil khanchi |
evolve: update some comments
|
| Thu, 13 Aug 2020 13:30:25 +0530 |
Sushil khanchi |
evolve: move a comment where it's going to belong
|
| Thu, 13 Aug 2020 13:28:09 +0530 |
Sushil khanchi |
evolve: update some comments acc. to upcoming behavior
|
| Wed, 12 Aug 2020 17:30:18 +0530 |
Sushil khanchi |
evolve: move a block of code up for early return
|
| Wed, 12 Aug 2020 17:21:05 +0530 |
Sushil khanchi |
evolve: rename haspubdiv to haspublicdiv for more clarity
|
| Fri, 07 Aug 2020 00:25:13 +0530 |
Sushil khanchi |
evolve: add some assertions
|
| Thu, 06 Aug 2020 18:24:32 +0530 |
Sushil khanchi |
evolve: rename param `divergent` to `local` in a function
|
| Wed, 05 Aug 2020 15:04:48 +0530 |
Sushil khanchi |
evolve: rely on resolutionparent when relocating divergent csets
|
| Wed, 26 Aug 2020 09:07:52 -0700 |
Martin von Zweigbergk |
compat: let cleanupnodes() handle compat across hg commit b99903534e06
stable
|
| Wed, 26 Aug 2020 08:18:59 -0700 |
Martin von Zweigbergk |
compat: add a cleanupnodes() function
stable
|
| Tue, 25 Aug 2020 22:34:33 -0700 |
Martin von Zweigbergk |
metaedit: switch to cleanupnodes() so e.g. bookmarks are moved
stable
|
| Tue, 25 Aug 2020 22:50:28 -0700 |
Martin von Zweigbergk |
tests: show how metaedit doesn't update bookmarks
stable
|
| Tue, 21 Jul 2020 11:23:41 +0800 |
Anton Shestakov |
rewind: always compute successorsmap
|
| Tue, 21 Jul 2020 01:04:43 +0800 |
Anton Shestakov |
rewind: add a --dry-run flag
|
| Tue, 21 Jul 2020 01:03:18 +0800 |
Anton Shestakov |
rewind: avoid yoda condition
|
| Thu, 17 Sep 2020 19:51:08 +0800 |
Anton Shestakov |
tests: graphlog now only shows '%' if there are unresolved conflicts
|
| Thu, 17 Sep 2020 20:26:55 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Thu, 17 Sep 2020 20:05:39 +0200 |
Pierre-Yves David |
test: adjust output to current stable
stable
|
| Thu, 17 Sep 2020 14:51:45 +0530 |
Pulkit Goyal |
evolvecmd: don't set `branchmerge=True` while resolving phase divergence
stable
|
| Thu, 17 Sep 2020 18:58:47 +0200 |
Pierre-Yves David |
gitlab-ci: display the Mercurial revision used to run the test
stable
|
| Tue, 21 Jul 2020 01:02:46 +0800 |
Anton Shestakov |
rewind: sort imports
|
| Wed, 15 Jul 2020 10:10:55 +0800 |
Anton Shestakov |
tests: less words and less markup to maintain in test-rewind.t
|
| Thu, 10 Sep 2020 03:11:41 +0200 |
Pierre-Yves David |
changelog: mention the config source fix from Matt Harbisson
stable
|
| Sat, 05 Sep 2020 14:46:36 -0400 |
Matt Harbison |
config: specify the extension when forcing a config option
stable
|
| Sat, 05 Sep 2020 00:07:01 -0400 |
Matt Harbison |
tests: use the modern config setting to enable evolution in topic tests
stable
|
| Tue, 08 Sep 2020 11:56:17 +0800 |
Anton Shestakov |
branching: merge with stable
|
| Tue, 08 Sep 2020 11:24:38 +0800 |
Anton Shestakov |
packaging: mark as developer version
stable
|
| Tue, 08 Sep 2020 11:23:45 +0800 |
Anton Shestakov |
Added tag 10.0.2 for changeset 1cce884c9448
stable
|
| Tue, 08 Sep 2020 11:21:49 +0800 |
Anton Shestakov |
packaging: prepare version 10.0.2
stable 10.0.2
|
| Sun, 06 Sep 2020 06:02:34 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sun, 06 Sep 2020 06:02:28 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Sun, 06 Sep 2020 06:02:24 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
| Sun, 06 Sep 2020 05:47:32 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.0 into mercurial-4.9
mercurial-4.9
|
| Sun, 06 Sep 2020 05:45:28 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.1 into mercurial-5.0
mercurial-5.0
|
| Sun, 06 Sep 2020 05:42:26 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.2 into mercurial-5.1
mercurial-5.1
|
| Sun, 06 Sep 2020 05:40:19 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.3 into mercurial-5.2
mercurial-5.2
|
| Sun, 06 Sep 2020 05:38:24 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Sun, 06 Sep 2020 05:36:04 +0800 |
Anton Shestakov |
test-compat: merge stable into mercurial-5.4
mercurial-5.4
|
| Sun, 06 Sep 2020 05:32:36 +0800 |
Anton Shestakov |
changelog: update for 10.0.2
stable
|
| Fri, 04 Sep 2020 21:33:11 +0200 |
Pierre-Yves David |
changelog: mention the various fix to content-divergence solving
|
| Tue, 01 Sep 2020 10:41:42 +0530 |
Sushil khanchi |
evolve: refactor few lines for clear understanding
|
| Mon, 31 Aug 2020 01:19:12 +0530 |
Sushil khanchi |
evolve: update "old-other" in evolvestate for --stop functionality
|
| Tue, 04 Aug 2020 23:44:08 +0530 |
Sushil khanchi |
evolve: make consistent usage of variable throughout the func
|
| Mon, 31 Aug 2020 01:10:58 +0530 |
Sushil khanchi |
evolve: make sure we don't miss merging content of divergent changesets
|
| Wed, 05 Aug 2020 00:16:26 +0530 |
Sushil khanchi |
evolve: add test to show broken --continue case of content divergence
|
| Wed, 26 Aug 2020 00:05:52 -0700 |
Martin von Zweigbergk |
dirstate: replace _uncommitdirstate() by core's movedirstate()
stable
|
| Thu, 03 Sep 2020 09:21:58 -0700 |
Martin von Zweigbergk |
tests: add test showing that `hg uncommit --rev` can fail to mark file added
stable
|
| Wed, 26 Aug 2020 17:25:02 +0530 |
Sushil khanchi |
evolve: use evolvestate instead of populating a variable in functions
|
| Tue, 25 Aug 2020 22:34:33 -0700 |
Martin von Zweigbergk |
metaedit: switch to cleanupnodes() so e.g. bookmarks are moved
|
| Tue, 25 Aug 2020 22:50:28 -0700 |
Martin von Zweigbergk |
tests: show how metaedit doesn't update bookmarks
|
| Tue, 01 Sep 2020 23:35:43 -0400 |
Matt Harbison |
topic: fix the `topic(...)` revset to not select commits without a topic
stable
|
| Wed, 26 Aug 2020 14:09:09 +0200 |
Pierre-Yves David |
unstable-list: fix title level
|
| Wed, 26 Aug 2020 13:07:57 +0200 |
Pierre-Yves David |
unstable-list: add local table of content of each details section
|
| Wed, 26 Aug 2020 13:07:35 +0200 |
Pierre-Yves David |
unstable-list: add a general table of content
|
| Wed, 26 Aug 2020 16:10:29 +0200 |
Pierre-Yves David |
unstable-list: move copytright after the title
|
| Sat, 22 Aug 2020 07:24:46 +0800 |
Anton Shestakov |
split: use the last created commit as target for discard action
stable
|
