Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 4512: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip
age author description
Thu, 11 Apr 2019 22:41:41 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Thu, 11 Apr 2019 22:41:25 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.8 mercurial-4.8
Thu, 11 Apr 2019 22:41:06 +0200 Pierre-Yves David changelog: merge 8.4.1 and 8.5.1 entries stable
Thu, 11 Apr 2019 21:43:37 +0200 Pierre-Yves David branching: merge stable into default stable
Thu, 11 Apr 2019 21:12:09 +0200 Pierre-Yves David branching: merge default change into stable stable
Thu, 11 Apr 2019 22:13:55 +0200 Pierre-Yves David branching: merge default branch in stable to prepare 8.5.0 release stable
Tue, 02 Apr 2019 22:42:01 -0400 Matt Harbison uncommit: abort if an explicitly given file cannot be uncommitted (BC)
Thu, 11 Apr 2019 17:45:36 +0800 Anton Shestakov evolve: store --update flag state in evolvestate file
Fri, 12 Apr 2019 02:55:34 +0800 Anton Shestakov state: implement cmdstate.__contains__()
Thu, 11 Apr 2019 21:19:01 +0200 Pierre-Yves David changelog: mention Martin work on phase-divergence
Thu, 11 Apr 2019 21:09:31 +0200 Pierre-Yves David test: revert update from 5.0 record logic stable
Thu, 11 Apr 2019 17:42:48 +0800 Anton Shestakov tests: remove note about already implemented --confirm with --continue
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
Thu, 04 Apr 2019 12:24:28 +0200 Pierre-Yves David test: apply unstability resolution to `test-unstability-resolution-result.t`
Thu, 04 Apr 2019 12:06:33 +0200 Pierre-Yves David test: rename and clarify content of test-unstable-content-divergent.t
Thu, 04 Apr 2019 11:53:05 +0200 Pierre-Yves David test: rename and clarify content of test-unstable-orphan.t
Wed, 03 Apr 2019 01:00:33 +0530 Sushil khanchi evolve: refactor the code which swap two nodes (in divergence resolution)
Tue, 02 Apr 2019 18:01:43 +0530 Sushil khanchi evolve: remove tmpctx arg from _resolvephasedivergent()
Fri, 29 Mar 2019 11:48:36 +0100 Pierre-Yves David doc: clarify _resolvephasedivergent role and constraint
Tue, 02 Apr 2019 20:32:15 +0200 Pierre-Yves David branching: merge with stable
Wed, 13 Feb 2019 21:39:10 +0800 Anton Shestakov evolve: unindent some lines caught by flake8 stable
Wed, 13 Feb 2019 21:56:29 +0800 Anton Shestakov obsexchange: avoid importing io/StringIO module with a different name stable
Wed, 13 Feb 2019 21:56:05 +0800 Anton Shestakov evolve: remove unused StringIO import stable
Fri, 22 Mar 2019 09:45:07 -0700 Martin von Zweigbergk compat: add support for new arg name in memfilectx.__init__ stable
Wed, 21 Nov 2018 12:00:46 +0000 Martijn Pieters topic: make topics compatible with branchmap refactor stable
Fri, 29 Mar 2019 11:19:24 +0100 Sushil khanchi evolve: compat patch to fix broken evolve obsdiscovery
Thu, 28 Mar 2019 15:05:57 -0700 Martin von Zweigbergk tests: add obslog output to some tests for divergence resolution
Thu, 28 Mar 2019 14:54:46 -0700 Martin von Zweigbergk tests: add tests for divergence resolution with split+amend
Tue, 26 Mar 2019 12:53:50 +0100 Pierre-Yves David test: use 'split' instead of 'splitted' in the tests
Tue, 26 Mar 2019 12:30:10 +0100 Pierre-Yves David evolve: drop the "computing new diff message" for phase-divergence
Wed, 20 Mar 2019 09:19:02 -0700 Martin von Zweigbergk evolve: clarify output when phase-divergence resolution results in no change
less more | rev 4512: (0) -3000 -1000 -300 -100 -60 +60 +100 +300 +1000 tip