| 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
|
| Fri, 29 Mar 2019 11:48:36 +0100 |
Pierre-Yves David |
doc: clarify _resolvephasedivergent role and constraint
|
changeset |
files
|
| Tue, 02 Apr 2019 20:32:15 +0200 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 13 Feb 2019 21:39:10 +0800 |
Anton Shestakov |
evolve: unindent some lines caught by flake8
stable
|
changeset |
files
|
| Wed, 13 Feb 2019 21:56:29 +0800 |
Anton Shestakov |
obsexchange: avoid importing io/StringIO module with a different name
stable
|
changeset |
files
|
| Wed, 13 Feb 2019 21:56:05 +0800 |
Anton Shestakov |
evolve: remove unused StringIO import
stable
|
changeset |
files
|
| Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
stable
|
changeset |
files
|
| Wed, 21 Nov 2018 12:00:46 +0000 |
Martijn Pieters |
topic: make topics compatible with branchmap refactor
stable
|
changeset |
files
|
| Fri, 29 Mar 2019 11:19:24 +0100 |
Sushil khanchi |
evolve: compat patch to fix broken evolve obsdiscovery
|
changeset |
files
|
| Thu, 28 Mar 2019 15:05:57 -0700 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
changeset |
files
|
| Thu, 28 Mar 2019 14:54:46 -0700 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
changeset |
files
|
| Tue, 26 Mar 2019 12:53:50 +0100 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
changeset |
files
|
| Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
changeset |
files
|
| Wed, 20 Mar 2019 09:19:02 -0700 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
changeset |
files
|
| Tue, 12 Mar 2019 09:44:05 -0700 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
changeset |
files
|
| Thu, 28 Mar 2019 12:37:55 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Wed, 27 Mar 2019 20:52:30 +0800 |
Anton Shestakov |
topicmap: add compatibility for branchcache that now uses self._entries
stable
|
changeset |
files
|
| Wed, 27 Mar 2019 14:29:22 +0530 |
Sushil khanchi |
evolve: fix over-idented block
stable
|
changeset |
files
|
| Tue, 12 Mar 2019 09:48:05 -0700 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
changeset |
files
|
| Tue, 26 Mar 2019 11:23:09 +0100 |
Pierre-Yves David |
branching: merge with stable
|
changeset |
files
|
| Mon, 25 Mar 2019 15:45:11 -0700 |
Martin von Zweigbergk |
touch: use action "touch", not "<function touch at ...>", in precheck
stable
|
changeset |
files
|
| Mon, 25 Mar 2019 15:44:44 -0700 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
changeset |
files
|
| Sun, 24 Mar 2019 21:30:12 +0530 |
Pierre-Yves David |
evolve: test a common case of public divergence
|
changeset |
files
|
| Sun, 24 Mar 2019 21:29:44 +0530 |
Sushil khanchi |
evolve: add condition in case of pubdiv to not swap the two div csets
|
changeset |
files
|
| Sat, 23 Mar 2019 02:10:31 +0530 |
Sushil khanchi |
evolve: add logic to handle a particular case in divergence resolution
|
changeset |
files
|
| Fri, 22 Mar 2019 00:16:44 +0530 |
Sushil khanchi |
evolve: add a test reflecting wrong behaviour of content-div resolution
|
changeset |
files
|
| Fri, 22 Mar 2019 09:45:07 -0700 |
Martin von Zweigbergk |
compat: add support for new arg name in memfilectx.__init__
|
changeset |
files
|
| Wed, 13 Mar 2019 17:32:14 +0530 |
Sushil khanchi |
evolve: preserve compatibility for hg < 4.8 versions
|
changeset |
files
|
| Sat, 09 Mar 2019 19:25:34 +0530 |
Sushil khanchi |
evolve: warn user if cset desc is being lost
|
changeset |
files
|
| Sun, 10 Mar 2019 18:00:08 +0100 |
Pierre-Yves David |
changelog: mention latest improvement
|
changeset |
files
|
| Sun, 10 Mar 2019 18:50:00 +0800 |
Anton Shestakov |
stack: make @ (current) more important than $ (some sort of unstable)
|
changeset |
files
|
| Sat, 09 Mar 2019 13:13:53 +0800 |
Anton Shestakov |
stack: show content and phase divergent state and symbol
|
changeset |
files
|
| Sat, 09 Mar 2019 12:54:00 +0800 |
Anton Shestakov |
stack: handle external-children just like other states
|
changeset |
files
|
| Thu, 07 Mar 2019 22:50:56 +0800 |
Anton Shestakov |
stack: optimize revset used for stack --children
|
changeset |
files
|
| Thu, 07 Mar 2019 19:13:45 +0800 |
Anton Shestakov |
stack: rename unstable -> orphan
|
changeset |
files
|
| Wed, 06 Mar 2019 21:47:08 +0800 |
Anton Shestakov |
evolvecmd: compatibility with older geteffectflag() that took a tuple
|
changeset |
files
|
| Wed, 06 Mar 2019 21:42:32 +0800 |
Anton Shestakov |
obshistory: remove unused geteffectflag(), it's been in core since 4.4
|
changeset |
files
|