evolve: revision graph

graph

less more | rev 4523: (0) -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 tip

testcompat: open a branch dedicated to mercurial 4.9 mercurial-4.9
Wed, 17 Apr 2019 20:52:15 +0200, by Pierre-Yves David
topic: add compatibility for writing copy metadata in changelog.add() stable
Wed, 17 Apr 2019 18:46:41 +0800, by Anton Shestakov
serverminitopic: add compatibility for branchcache that now uses self._entries stable
Wed, 17 Apr 2019 16:18:22 +0800, by Anton Shestakov
branching: merge stable into default
Fri, 12 Apr 2019 02:21:09 +0200, by Pierre-Yves David
packaging: mark version as development version stable
Fri, 12 Apr 2019 02:20:24 +0200, by Pierre-Yves David
Added tag 8.5.0 for changeset 33c617626fd9 stable
Fri, 12 Apr 2019 02:17:03 +0200, by Pierre-Yves David
packaging: prepare version 8.5.0 stable 8.5.0
Fri, 12 Apr 2019 02:15:24 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Thu, 11 Apr 2019 22:44:53 +0200, by Pierre-Yves David
branching: merge stable back into default
Fri, 12 Apr 2019 02:07:53 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Thu, 11 Apr 2019 22:42:14 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Thu, 11 Apr 2019 22:42:13 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Thu, 11 Apr 2019 22:41:41 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.8 mercurial-4.8
Thu, 11 Apr 2019 22:41:25 +0200, by Pierre-Yves David
changelog: merge 8.4.1 and 8.5.1 entries stable
Thu, 11 Apr 2019 22:41:06 +0200, by Pierre-Yves David
branching: merge stable into default stable
Thu, 11 Apr 2019 21:43:37 +0200, by Pierre-Yves David
branching: merge default change into stable stable
Thu, 11 Apr 2019 21:12:09 +0200, by Pierre-Yves David
branching: merge default branch in stable to prepare 8.5.0 release stable
Thu, 11 Apr 2019 22:13:55 +0200, by Pierre-Yves David
uncommit: abort if an explicitly given file cannot be uncommitted (BC)
Tue, 02 Apr 2019 22:42:01 -0400, by Matt Harbison
evolve: store --update flag state in evolvestate file
Thu, 11 Apr 2019 17:45:36 +0800, by Anton Shestakov
state: implement cmdstate.__contains__()
Fri, 12 Apr 2019 02:55:34 +0800, by Anton Shestakov
changelog: mention Martin work on phase-divergence
Thu, 11 Apr 2019 21:19:01 +0200, by Pierre-Yves David
test: revert update from 5.0 record logic stable
Thu, 11 Apr 2019 21:09:31 +0200, by Pierre-Yves David
tests: remove note about already implemented --confirm with --continue
Thu, 11 Apr 2019 17:42:48 +0800, by Anton Shestakov
evolve: use merge.update() for resolving phase divergence
Mon, 11 Mar 2019 23:57:12 -0700, by Martin von Zweigbergk
evolve: compat patch for recordfilter change in mercurial
Wed, 10 Apr 2019 23:19:29 +0530, by Sushil khanchi
test: add file cancelation scenario for phase-divergence
Wed, 10 Apr 2019 21:03:56 +0200, by Pierre-Yves David
test: introduce a more complete test for phase-divergence
Wed, 10 Apr 2019 20:43:42 +0200, by Pierre-Yves David
test: rename test about content divergent meta data
Wed, 10 Apr 2019 20:24:55 +0200, by Pierre-Yves David
test: cleanup title and doc phase-divergent cases
Wed, 10 Apr 2019 20:18:14 +0200, by Pierre-Yves David
test: remove remaining duplicated file
Wed, 10 Apr 2019 20:03:07 +0200, by Pierre-Yves David
test: add test for content-divergence with file removal
Wed, 10 Apr 2019 17:57:11 +0200, by Pierre-Yves David
test: clarify changeset concent in the first content-divergence test
Wed, 10 Apr 2019 17:29:40 +0200, by Pierre-Yves David
branching: merge with stable
Wed, 10 Apr 2019 16:59:58 +0200, by Pierre-Yves David
branching: merge with test consolidation
Wed, 10 Apr 2019 16:59:28 +0200, by Pierre-Yves David
branching: merge with stable
Wed, 10 Apr 2019 16:40:58 +0200, by Pierre-Yves David
compat: drop getcachevfs, repo.cachevfs is supported in hg 4.4
Sun, 07 Apr 2019 20:00:16 +0200, by Joerg Sonnenberger
evolve: when using evolve, cache files belong into the master repo
Sun, 07 Apr 2019 19:53:53 +0200, by Joerg Sonnenberger
changelog: mention issue6089 fix stable
Wed, 10 Apr 2019 16:11:59 +0200, by Pierre-Yves David
pick: update working dir branch (issue6089) stable
Sat, 23 Feb 2019 15:17:55 +0100, by Manuel Jacob
tests: rename test-grab to test-pick stable
Wed, 10 Apr 2019 15:47:28 +0200, by Pierre-Yves David
evolve: make sure div resolution don't replace the initial author (issue6113) stable
Wed, 10 Apr 2019 15:37:29 +0200, by Sushil khanchi
evolve: add test which demonstrate issue6113 stable
Wed, 10 Apr 2019 15:26:41 +0200, by Sushil khanchi
test: consolidate the content-divergent test cases stable
Wed, 10 Apr 2019 14:32:00 +0200, by Pierre-Yves David
changelog: mention the fix to issue6057 stable
Tue, 09 Apr 2019 21:16:49 +0200, by Pierre-Yves David
extensions: avoid enabling evolve for unrelated repositories (issue6057) stable
Tue, 09 Apr 2019 20:45:36 +0200, by Pierre-Yves David
stack: improve set combination logic
Sat, 06 Apr 2019 15:50:15 +0200, by Anton Shestakov
stack: fix phasecache._phasesets check logic
Sat, 06 Apr 2019 15:49:22 +0200, by Anton Shestakov
evolve: remove todo markers from a test which has been fixed
Tue, 02 Apr 2019 12:41:57 +0530, by Sushil khanchi
next: clarify tests related to `commands.update.check` test
Fri, 05 Apr 2019 22:28:07 +0200, by Pierre-Yves David
stack: simplify phasecache checks in _stackcandidates()
Wed, 03 Apr 2019 17:20:34 +0800, by Anton Shestakov
evolve: fix divergence resolution when not merging a descendant
Fri, 05 Apr 2019 17:45:59 +0200, by Pierre-Yves David
test: fix a phase divergence test case to actually not contains conflict
Fri, 29 Mar 2019 15:15:07 +0100, by Pierre-Yves David
tests: use current instability names everywhere
Fri, 05 Apr 2019 16:31:45 +0200, by Pierre-Yves David
test: apply unstability resolution to `test-unstability-resolution-result.t`
Thu, 04 Apr 2019 12:24:28 +0200, by Pierre-Yves David
test: rename and clarify content of test-unstable-content-divergent.t
Thu, 04 Apr 2019 12:06:33 +0200, by Pierre-Yves David
test: rename and clarify content of test-unstable-orphan.t
Thu, 04 Apr 2019 11:53:05 +0200, by Pierre-Yves David
evolve: refactor the code which swap two nodes (in divergence resolution)
Wed, 03 Apr 2019 01:00:33 +0530, by Sushil khanchi
evolve: remove tmpctx arg from _resolvephasedivergent()
Tue, 02 Apr 2019 18:01:43 +0530, by Sushil khanchi
doc: clarify _resolvephasedivergent role and constraint
Fri, 29 Mar 2019 11:48:36 +0100, by Pierre-Yves David
branching: merge with stable
Tue, 02 Apr 2019 20:32:15 +0200, by Pierre-Yves David
evolve: unindent some lines caught by flake8 stable
Wed, 13 Feb 2019 21:39:10 +0800, by Anton Shestakov
obsexchange: avoid importing io/StringIO module with a different name stable
Wed, 13 Feb 2019 21:56:29 +0800, by Anton Shestakov
evolve: remove unused StringIO import stable
Wed, 13 Feb 2019 21:56:05 +0800, by Anton Shestakov
compat: add support for new arg name in memfilectx.__init__ stable
Fri, 22 Mar 2019 09:45:07 -0700, by Martin von Zweigbergk
topic: make topics compatible with branchmap refactor stable
Wed, 21 Nov 2018 12:00:46 +0000, by Martijn Pieters
evolve: compat patch to fix broken evolve obsdiscovery
Fri, 29 Mar 2019 11:19:24 +0100, by Sushil khanchi
tests: add obslog output to some tests for divergence resolution
Thu, 28 Mar 2019 15:05:57 -0700, by Martin von Zweigbergk
tests: add tests for divergence resolution with split+amend
Thu, 28 Mar 2019 14:54:46 -0700, by Martin von Zweigbergk
test: use 'split' instead of 'splitted' in the tests
Tue, 26 Mar 2019 12:53:50 +0100, by Pierre-Yves David
evolve: drop the "computing new diff message" for phase-divergence
Tue, 26 Mar 2019 12:30:10 +0100, by Pierre-Yves David
evolve: clarify output when phase-divergence resolution results in no change
Wed, 20 Mar 2019 09:19:02 -0700, by Martin von Zweigbergk
tests: reduce dependence on previous tests for setup
Tue, 12 Mar 2019 09:44:05 -0700, by Martin von Zweigbergk
branching: merge with stable
Thu, 28 Mar 2019 12:37:55 +0100, by Pierre-Yves David
topicmap: add compatibility for branchcache that now uses self._entries stable
Wed, 27 Mar 2019 20:52:30 +0800, by Anton Shestakov
evolve: fix over-idented block stable
Wed, 27 Mar 2019 14:29:22 +0530, by Sushil khanchi
tests: create "private" repository in already-updated state
Tue, 12 Mar 2019 09:48:05 -0700, by Martin von Zweigbergk
branching: merge with stable
Tue, 26 Mar 2019 11:23:09 +0100, by Pierre-Yves David
touch: use action "touch", not "<function touch at ...>", in precheck stable
Mon, 25 Mar 2019 15:45:11 -0700, by Martin von Zweigbergk
prune: use action "prune", not "touch", in precheck stable
Mon, 25 Mar 2019 15:44:44 -0700, by Martin von Zweigbergk
evolve: test a common case of public divergence
Sun, 24 Mar 2019 21:30:12 +0530, by Pierre-Yves David
evolve: add condition in case of pubdiv to not swap the two div csets
Sun, 24 Mar 2019 21:29:44 +0530, by Sushil khanchi
evolve: add logic to handle a particular case in divergence resolution
Sat, 23 Mar 2019 02:10:31 +0530, by Sushil khanchi
evolve: add a test reflecting wrong behaviour of content-div resolution
Fri, 22 Mar 2019 00:16:44 +0530, by Sushil khanchi
compat: add support for new arg name in memfilectx.__init__
Fri, 22 Mar 2019 09:45:07 -0700, by Martin von Zweigbergk
evolve: preserve compatibility for hg < 4.8 versions
Wed, 13 Mar 2019 17:32:14 +0530, by Sushil khanchi
evolve: warn user if cset desc is being lost
Sat, 09 Mar 2019 19:25:34 +0530, by Sushil khanchi
changelog: mention latest improvement
Sun, 10 Mar 2019 18:00:08 +0100, by Pierre-Yves David
stack: make @ (current) more important than $ (some sort of unstable)
Sun, 10 Mar 2019 18:50:00 +0800, by Anton Shestakov
stack: show content and phase divergent state and symbol
Sat, 09 Mar 2019 13:13:53 +0800, by Anton Shestakov
stack: handle external-children just like other states
Sat, 09 Mar 2019 12:54:00 +0800, by Anton Shestakov
stack: optimize revset used for stack --children
Thu, 07 Mar 2019 22:50:56 +0800, by Anton Shestakov
stack: rename unstable -> orphan
Thu, 07 Mar 2019 19:13:45 +0800, by Anton Shestakov
evolvecmd: compatibility with older geteffectflag() that took a tuple
Wed, 06 Mar 2019 21:47:08 +0800, by Anton Shestakov
obshistory: remove unused geteffectflag(), it's been in core since 4.4
Wed, 06 Mar 2019 21:42:32 +0800, by Anton Shestakov
compat: remove old vocabulary change fallbacks
Wed, 06 Mar 2019 16:56:25 +0800, by Anton Shestakov
branching: merge with stable
Thu, 07 Mar 2019 10:51:48 +0100, by Pierre-Yves David

less more | rev 4523: (0) -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 tip

Mercurial > evolve

graph