| Mon, 11 Mar 2019 23:57:12 -0700 |
Martin von Zweigbergk |
evolve: use merge.update() for resolving phase divergence
|
| Wed, 10 Apr 2019 23:19:29 +0530 |
Sushil khanchi |
evolve: compat patch for recordfilter change in mercurial
|
| Wed, 10 Apr 2019 21:03:56 +0200 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
| Wed, 10 Apr 2019 20:43:42 +0200 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
| Wed, 10 Apr 2019 20:24:55 +0200 |
Pierre-Yves David |
test: rename test about content divergent meta data
|
| Wed, 10 Apr 2019 20:18:14 +0200 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
| Wed, 10 Apr 2019 20:03:07 +0200 |
Pierre-Yves David |
test: remove remaining duplicated file
|
| Wed, 10 Apr 2019 17:57:11 +0200 |
Pierre-Yves David |
test: add test for content-divergence with file removal
|
| Wed, 10 Apr 2019 17:29:40 +0200 |
Pierre-Yves David |
test: clarify changeset concent in the first content-divergence test
|
| Wed, 10 Apr 2019 16:59:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Wed, 10 Apr 2019 16:59:28 +0200 |
Pierre-Yves David |
branching: merge with test consolidation
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Sun, 07 Apr 2019 20:00:16 +0200 |
Joerg Sonnenberger |
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
|
| Sun, 07 Apr 2019 19:53:53 +0200 |
Joerg Sonnenberger |
evolve: when using evolve, cache files belong into the master repo
|
| Wed, 10 Apr 2019 16:11:59 +0200 |
Pierre-Yves David |
changelog: mention issue6089 fix
stable
|
| Sat, 23 Feb 2019 15:17:55 +0100 |
Manuel Jacob |
pick: update working dir branch (issue6089)
stable
|
| Wed, 10 Apr 2019 15:47:28 +0200 |
Pierre-Yves David |
tests: rename test-grab to test-pick
stable
|
| Wed, 10 Apr 2019 15:37:29 +0200 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
| Wed, 10 Apr 2019 15:26:41 +0200 |
Sushil khanchi |
evolve: add test which demonstrate issue6113
stable
|
| Wed, 10 Apr 2019 14:32:00 +0200 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
|
| Tue, 09 Apr 2019 21:16:49 +0200 |
Pierre-Yves David |
changelog: mention the fix to issue6057
stable
|
| Tue, 09 Apr 2019 20:45:36 +0200 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
| Sat, 06 Apr 2019 15:50:15 +0200 |
Anton Shestakov |
stack: improve set combination logic
|
| Sat, 06 Apr 2019 15:49:22 +0200 |
Anton Shestakov |
stack: fix phasecache._phasesets check logic
|
| Tue, 02 Apr 2019 12:41:57 +0530 |
Sushil khanchi |
evolve: remove todo markers from a test which has been fixed
|
| Fri, 05 Apr 2019 22:28:07 +0200 |
Pierre-Yves David |
next: clarify tests related to `commands.update.check` test
|
| Wed, 03 Apr 2019 17:20:34 +0800 |
Anton Shestakov |
stack: simplify phasecache checks in _stackcandidates()
|
| Fri, 05 Apr 2019 17:45:59 +0200 |
Pierre-Yves David |
evolve: fix divergence resolution when not merging a descendant
|
| Fri, 29 Mar 2019 15:15:07 +0100 |
Pierre-Yves David |
test: fix a phase divergence test case to actually not contains conflict
|
| Fri, 05 Apr 2019 16:31:45 +0200 |
Pierre-Yves David |
tests: use current instability names everywhere
|
