| 2019-04-07 |
Joerg Sonnenberger |
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
|
changeset |
files
|
| 2019-04-07 |
Joerg Sonnenberger |
evolve: when using evolve, cache files belong into the master repo
|
changeset |
files
|
| 2019-04-10 |
Pierre-Yves David |
changelog: mention issue6089 fix
stable
|
changeset |
files
|
| 2019-02-23 |
Manuel Jacob |
pick: update working dir branch (issue6089)
stable
|
changeset |
files
|
| 2019-04-10 |
Pierre-Yves David |
tests: rename test-grab to test-pick
stable
|
changeset |
files
|
| 2019-04-10 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
changeset |
files
|
| 2019-04-10 |
Sushil khanchi |
evolve: add test which demonstrate issue6113
stable
|
changeset |
files
|
| 2019-04-10 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
|
changeset |
files
|
| 2019-04-09 |
Pierre-Yves David |
changelog: mention the fix to issue6057
stable
|
changeset |
files
|
| 2019-04-09 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
changeset |
files
|
| 2019-04-06 |
Anton Shestakov |
stack: improve set combination logic
|
changeset |
files
|
| 2019-04-06 |
Anton Shestakov |
stack: fix phasecache._phasesets check logic
|
changeset |
files
|
| 2019-04-02 |
Sushil khanchi |
evolve: remove todo markers from a test which has been fixed
|
changeset |
files
|
| 2019-04-05 |
Pierre-Yves David |
next: clarify tests related to `commands.update.check` test
|
changeset |
files
|
| 2019-04-03 |
Anton Shestakov |
stack: simplify phasecache checks in _stackcandidates()
|
changeset |
files
|
| 2019-04-05 |
Pierre-Yves David |
evolve: fix divergence resolution when not merging a descendant
|
changeset |
files
|
| 2019-03-29 |
Pierre-Yves David |
test: fix a phase divergence test case to actually not contains conflict
|
changeset |
files
|
| 2019-04-05 |
Pierre-Yves David |
tests: use current instability names everywhere
|
changeset |
files
|
| 2019-04-04 |
Pierre-Yves David |
test: apply unstability resolution to `test-unstability-resolution-result.t`
|
changeset |
files
|
| 2019-04-04 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-content-divergent.t
|
changeset |
files
|
| 2019-04-04 |
Pierre-Yves David |
test: rename and clarify content of test-unstable-orphan.t
|
changeset |
files
|
| 2019-04-02 |
Sushil khanchi |
evolve: refactor the code which swap two nodes (in divergence resolution)
|
changeset |
files
|
| 2019-04-02 |
Sushil khanchi |
evolve: remove tmpctx arg from _resolvephasedivergent()
|
changeset |
files
|
| 2019-03-29 |
Pierre-Yves David |
doc: clarify _resolvephasedivergent role and constraint
|
changeset |
files
|
| 2019-04-02 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| 2019-02-13 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
stable
|
changeset |
files
|
| 2019-02-13 |
Anton Shestakov |
obsexchange: avoid importing io/StringIO module with a different name
stable
|
changeset |
files
|
| 2019-02-13 |
Anton Shestakov |
evolve: remove unused StringIO import
stable
|
changeset |
files
|
| 2019-03-22 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
stable
|
changeset |
files
|
| 2018-11-21 |
Martijn Pieters |
topic: make topics compatible with branchmap refactor
stable
|
changeset |
files
|
| 2019-03-29 |
Sushil khanchi |
evolve: compat patch to fix broken evolve obsdiscovery
|
changeset |
files
|
| 2019-03-28 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
changeset |
files
|
| 2019-03-28 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
changeset |
files
|
| 2019-03-26 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
changeset |
files
|
| 2019-03-26 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
changeset |
files
|
| 2019-03-20 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
changeset |
files
|
| 2019-03-12 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
changeset |
files
|
| 2019-03-28 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| 2019-03-27 |
Anton Shestakov |
topicmap: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
| 2019-03-27 |
Sushil khanchi |
evolve: fix over-idented block
stable
|
changeset |
files
|
| 2019-03-12 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
changeset |
files
|
| 2019-03-26 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| 2019-03-25 |
Martin von Zweigbergk |
touch: use action "touch", not "<function touch at ...>", in precheck
stable
|
changeset |
files
|
| 2019-03-25 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
changeset |
files
|
| 2019-03-24 |
Pierre-Yves David |
evolve: test a common case of public divergence
|
changeset |
files
|
| 2019-03-24 |
Sushil khanchi |
evolve: add condition in case of pubdiv to not swap the two div csets
|
changeset |
files
|
| 2019-03-22 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
changeset |
files
|
| 2019-03-21 |
Sushil khanchi |
evolve: add a test reflecting wrong behaviour of content-div resolution
|
changeset |
files
|