| Sun, 21 Apr 2019 12:06:31 +0530 |
Sushil khanchi |
test: remove duplicated test
|
changeset |
files
|
| Sat, 09 Mar 2019 19:35:45 +0530 |
Sushil khanchi |
evolve: warn user for the metadata being lost in public divergence resolution
|
changeset |
files
|
| Wed, 17 Apr 2019 21:16:17 +0530 |
Sushil khanchi |
evolve: show a status message when merging leads to public cset
|
changeset |
files
|
| Wed, 24 Apr 2019 20:32:01 +0200 |
Pierre-Yves David |
test: use a shorter test name
|
changeset |
files
|
| Wed, 10 Apr 2019 18:20:33 +0800 |
Anton Shestakov |
stack: rename troubledcount to unstablecount
|
changeset |
files
|
| Wed, 24 Apr 2019 17:21:21 +0800 |
Anton Shestakov |
evolve: use --all by default (BC)
|
changeset |
files
|
| Wed, 24 Apr 2019 17:02:27 +0800 |
Anton Shestakov |
tests: add --rev to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
| Wed, 24 Apr 2019 16:35:01 +0800 |
Anton Shestakov |
tests: add --no-all to hg evolve to reduce test changes
|
changeset |
files
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
changeset |
files
|
| Sun, 14 Apr 2019 02:18:19 +0800 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
changeset |
files
|
| Wed, 24 Apr 2019 15:57:49 +0200 |
Anton Shestakov |
tests: don't create a nested repo for no reason
|
changeset |
files
|
| Wed, 24 Apr 2019 14:38:26 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 23 Apr 2019 15:57:04 +0200 |
Pierre-Yves David |
Added tag 8.5.1 for changeset 05c9dcf5512e
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 15:30:39 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.1
stable 8.5.1
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:11 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:08 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 23 Apr 2019 14:18:05 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Mon, 22 Apr 2019 22:14:26 -0700 |
Martin von Zweigbergk |
evolve: fix progress display with hg<4.7
stable
|
changeset |
files
|
| Sat, 20 Apr 2019 05:21:14 +0200 |
Pierre-Yves David |
packaging: mark extensions as tested with 5.0
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 13:26:35 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:48 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:47 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:45 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Tue, 23 Apr 2019 12:24:22 +0200 |
Pierre-Yves David |
compat: drop support for Mercurial 4.4
|
changeset |
files
|
| Tue, 23 Apr 2019 12:29:42 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Tue, 23 Apr 2019 12:20:12 +0200 |
Pierre-Yves David |
compat: backed out changeset cfcb7eedc666
stable
|
changeset |
files
|
| Tue, 23 Apr 2019 12:28:32 +0200 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:11 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:09 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:07 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:06 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.9 into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Sat, 20 Apr 2019 03:55:04 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Fri, 19 Apr 2019 10:31:53 +0530 |
Sushil khanchi |
compat: fix a typo in compat patch
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 23:51:13 +0200 |
Pierre-Yves David |
changelog: mention extensions isolation (issue6121)
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:03:01 +0200 |
Pierre-Yves David |
topic: only wrap wireprotocaps for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:52 +0200 |
Pierre-Yves David |
topic: only wrap _pushb2phases for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:44 +0200 |
Pierre-Yves David |
topic: only wrap handlecheckheads for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:02:06 +0200 |
Pierre-Yves David |
topic: only wrap wireprotobranchmap for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 13:01:39 +0200 |
Pierre-Yves David |
topic: only wrap _headssummary for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:41:41 +0200 |
Pierre-Yves David |
topic: only wrap desthistedit for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:40:53 +0200 |
Pierre-Yves David |
topic: only wrap _destupdatetopic for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:39:41 +0200 |
Pierre-Yves David |
topic: only wrap _destmergebranch for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 12:36:11 +0200 |
Pierre-Yves David |
topic: only wrap gettopicrepo for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:49 +0200 |
Pierre-Yves David |
topic: only wrap mergeupdate for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:39 +0200 |
Pierre-Yves David |
topic: only wrap committext for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:24 +0200 |
Pierre-Yves David |
topic: only affect `hg commit` behavior for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:13:14 +0200 |
Pierre-Yves David |
topic: only wrap workingctx.__init__ for repo with topic
stable
|
changeset |
files
|
| Thu, 18 Apr 2019 11:12:58 +0200 |
Pierre-Yves David |
topic: introduce a `hastopicext(repo)` function
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 00:20:44 +0530 |
Sushil khanchi |
tests: consolidate the public-content-divergent test cases
|
changeset |
files
|
| Wed, 17 Apr 2019 12:31:17 +0530 |
Sushil khanchi |
evolve: improve inline documentation for the public divergence resolution
|
changeset |
files
|
| Sun, 14 Apr 2019 20:26:05 +0530 |
Sushil khanchi |
cleanup: remove a duplicated line
|
changeset |
files
|
| Wed, 17 Apr 2019 21:39:28 +0200 |
Pierre-Yves David |
changelog: mention topic compatibility
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 20:58:10 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Wed, 17 Apr 2019 20:56:24 +0200 |
Pierre-Yves David |
tescompat: revert test change for mercurial-4.9
mercurial-4.9
|
changeset |
files
|
| Wed, 17 Apr 2019 20:54:28 +0200 |
Pierre-Yves David |
branching: merge 8.5.0 expected output in stable
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 20:52:15 +0200 |
Pierre-Yves David |
testcompat: open a branch dedicated to mercurial 4.9
mercurial-4.9
|
changeset |
files
|
| Wed, 17 Apr 2019 18:46:41 +0800 |
Anton Shestakov |
topic: add compatibility for writing copy metadata in changelog.add()
stable
|
changeset |
files
|
| Wed, 17 Apr 2019 16:18:22 +0800 |
Anton Shestakov |
serverminitopic: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:21:09 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
changeset |
files
|
| Fri, 12 Apr 2019 02:20:24 +0200 |
Pierre-Yves David |
packaging: mark version as development version
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:17:03 +0200 |
Pierre-Yves David |
Added tag 8.5.0 for changeset 33c617626fd9
stable
|
changeset |
files
|
| Fri, 12 Apr 2019 02:15:24 +0200 |
Pierre-Yves David |
packaging: prepare version 8.5.0
stable 8.5.0
|
changeset |
files
|
| Thu, 11 Apr 2019 22:44:53 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
changeset |
files
|
| Fri, 12 Apr 2019 02:07:53 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
changeset |
files
|
| Thu, 11 Apr 2019 22:42:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.6 into mercurial-4.5
mercurial-4.5
|
changeset |
files
|
| Thu, 11 Apr 2019 22:42:13 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:41 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:25 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.8
mercurial-4.8
|
changeset |
files
|
| Thu, 11 Apr 2019 22:41:06 +0200 |
Pierre-Yves David |
changelog: merge 8.4.1 and 8.5.1 entries
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 21:43:37 +0200 |
Pierre-Yves David |
branching: merge stable into default
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 21:12:09 +0200 |
Pierre-Yves David |
branching: merge default change into stable
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 22:13:55 +0200 |
Pierre-Yves David |
branching: merge default branch in stable to prepare 8.5.0 release
stable
|
changeset |
files
|
| Tue, 02 Apr 2019 22:42:01 -0400 |
Matt Harbison |
uncommit: abort if an explicitly given file cannot be uncommitted (BC)
|
changeset |
files
|
| Thu, 11 Apr 2019 17:45:36 +0800 |
Anton Shestakov |
evolve: store --update flag state in evolvestate file
|
changeset |
files
|
| Fri, 12 Apr 2019 02:55:34 +0800 |
Anton Shestakov |
state: implement cmdstate.__contains__()
|
changeset |
files
|
| Thu, 11 Apr 2019 21:19:01 +0200 |
Pierre-Yves David |
changelog: mention Martin work on phase-divergence
|
changeset |
files
|
| Thu, 11 Apr 2019 21:09:31 +0200 |
Pierre-Yves David |
test: revert update from 5.0 record logic
stable
|
changeset |
files
|
| Thu, 11 Apr 2019 17:42:48 +0800 |
Anton Shestakov |
tests: remove note about already implemented --confirm with --continue
|
changeset |
files
|
| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 23:19:29 +0530 |
Sushil khanchi |
evolve: compat patch for recordfilter change in mercurial
|
changeset |
files
|
| Wed, 10 Apr 2019 21:03:56 +0200 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 20:43:42 +0200 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
changeset |
files
|
| Wed, 10 Apr 2019 20:24:55 +0200 |
Pierre-Yves David |
test: rename test about content divergent meta data
|
changeset |
files
|
| Wed, 10 Apr 2019 20:18:14 +0200 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
changeset |
files
|
| Wed, 10 Apr 2019 20:03:07 +0200 |
Pierre-Yves David |
test: remove remaining duplicated file
|
changeset |
files
|
| Wed, 10 Apr 2019 17:57:11 +0200 |
Pierre-Yves David |
test: add test for content-divergence with file removal
|
changeset |
files
|
| Wed, 10 Apr 2019 17:29:40 +0200 |
Pierre-Yves David |
test: clarify changeset concent in the first content-divergence test
|
changeset |
files
|
| Wed, 10 Apr 2019 16:59:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 10 Apr 2019 16:59:28 +0200 |
Pierre-Yves David |
branching: merge with test consolidation
|
changeset |
files
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Sun, 07 Apr 2019 20:00:16 +0200 |
Joerg Sonnenberger |
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
|
changeset |
files
|
| Sun, 07 Apr 2019 19:53:53 +0200 |
Joerg Sonnenberger |
evolve: when using evolve, cache files belong into the master repo
|
changeset |
files
|
| Wed, 10 Apr 2019 16:11:59 +0200 |
Pierre-Yves David |
changelog: mention issue6089 fix
stable
|
changeset |
files
|
| Sat, 23 Feb 2019 15:17:55 +0100 |
Manuel Jacob |
pick: update working dir branch (issue6089)
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 15:47:28 +0200 |
Pierre-Yves David |
tests: rename test-grab to test-pick
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 15:37:29 +0200 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 15:26:41 +0200 |
Sushil khanchi |
evolve: add test which demonstrate issue6113
stable
|
changeset |
files
|
| Wed, 10 Apr 2019 14:32:00 +0200 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
|
changeset |
files
|
| Tue, 09 Apr 2019 21:16:49 +0200 |
Pierre-Yves David |
changelog: mention the fix to issue6057
stable
|
changeset |
files
|
| Tue, 09 Apr 2019 20:45:36 +0200 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
changeset |
files
|
| Sat, 06 Apr 2019 15:50:15 +0200 |
Anton Shestakov |
stack: improve set combination logic
|
changeset |
files
|
| Sat, 06 Apr 2019 15:49:22 +0200 |
Anton Shestakov |
stack: fix phasecache._phasesets check logic
|
changeset |
files
|
| Tue, 02 Apr 2019 12:41:57 +0530 |
Sushil khanchi |
evolve: remove todo markers from a test which has been fixed
|
changeset |
files
|
| Fri, 05 Apr 2019 22:28:07 +0200 |
Pierre-Yves David |
next: clarify tests related to `commands.update.check` test
|
changeset |
files
|
| Wed, 03 Apr 2019 17:20:34 +0800 |
Anton Shestakov |
stack: simplify phasecache checks in _stackcandidates()
|
changeset |
files
|
| Fri, 05 Apr 2019 17:45:59 +0200 |
Pierre-Yves David |
evolve: fix divergence resolution when not merging a descendant
|
changeset |
files
|
| Fri, 29 Mar 2019 15:15:07 +0100 |
Pierre-Yves David |
test: fix a phase divergence test case to actually not contains conflict
|
changeset |
files
|
| Fri, 05 Apr 2019 16:31:45 +0200 |
Pierre-Yves David |
tests: use current instability names everywhere
|
changeset |
files
|
| Thu, 04 Apr 2019 12:24:28 +0200 |
Pierre-Yves David |
test: apply unstability resolution to `test-unstability-resolution-result.t`
|
changeset |
files
|
| Thu, 04 Apr 2019 12:06:33 +0200 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-content-divergent.t
|
changeset |
files
|
| Thu, 04 Apr 2019 11:53:05 +0200 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-orphan.t
|
changeset |
files
|
| Wed, 03 Apr 2019 01:00:33 +0530 |
Sushil khanchi |
evolve: refactor the code which swap two nodes (in divergence resolution)
|
changeset |
files
|
| Tue, 02 Apr 2019 18:01:43 +0530 |
Sushil khanchi |
evolve: remove tmpctx arg from _resolvephasedivergent()
|
changeset |
files
|