Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 4615: (0) -3000 -1000 -240 +240 +1000 tip
age author description
Sat, 27 Apr 2019 19:32:03 -0400 Matt Harbison docs: change `precursors` references to `predecessors`
Sat, 27 Apr 2019 14:42:48 -0400 Matt Harbison docs: import figure diagrams with inkscape 0.92
Thu, 25 Apr 2019 15:14:21 -0700 Martin von Zweigbergk messages: standardize on "working copy is now at" including "is"
Thu, 25 Apr 2019 13:58:29 -0700 Martin von Zweigbergk evolve: move more of the progress-related variables together
Thu, 25 Apr 2019 14:02:11 -0700 Martin von Zweigbergk evolve: delete dead calculation of number of troubled revisions
Fri, 19 Apr 2019 10:23:53 -0700 Martin von Zweigbergk evolve: drop nested locks and transactions
Fri, 19 Apr 2019 11:12:00 -0700 Martin von Zweigbergk next: start transaction before calling _solveone()
Fri, 19 Apr 2019 10:22:25 -0700 Martin von Zweigbergk evolve: use single transaction also when continuing
Fri, 19 Apr 2019 09:41:39 -0700 Martin von Zweigbergk evolve: run in a single transaction
Fri, 19 Apr 2019 10:01:32 -0700 Martin von Zweigbergk evolve: extract function for solving one revision, including merges
Thu, 25 Apr 2019 17:20:32 +0800 Anton Shestakov evolve: mention that --all is the default behavior now
Thu, 25 Apr 2019 17:19:41 +0800 Anton Shestakov evolve: mention that not all successful operations currently update wdir
Tue, 23 Apr 2019 11:07:28 -0700 Martin von Zweigbergk evolve: add progress support for --continue
Tue, 23 Apr 2019 10:56:42 -0700 Martin von Zweigbergk evolve: reduce scope of progress-related variables
Tue, 23 Apr 2019 10:49:47 -0700 Martin von Zweigbergk evolve: move progress-clearing out of _cleanup()
Tue, 23 Apr 2019 10:52:33 -0700 Martin von Zweigbergk evolve: stop passing no-op "progresscb" into continueevolve()
Tue, 23 Apr 2019 09:45:45 -0700 Martin von Zweigbergk evolve: _solveunstable() update progress only once
Tue, 23 Apr 2019 09:35:34 -0700 Martin von Zweigbergk evolve: don't update progress just before clearing it
Tue, 23 Apr 2019 09:31:32 -0700 Martin von Zweigbergk evolve: clean up progress bar also when using -r
Tue, 23 Apr 2019 10:20:03 -0700 Martin von Zweigbergk tests: add some basic testing of progress
Fri, 19 Apr 2019 10:03:39 -0700 Martin von Zweigbergk evolve: increment progress *after* a whole merge commit is done
Fri, 19 Apr 2019 11:02:35 -0700 Martin von Zweigbergk evolve: use util.acceptintervention() for closing transactions
Fri, 19 Apr 2019 10:32:32 -0700 Martin von Zweigbergk evolve: use context manager for transactions
Fri, 19 Apr 2019 10:52:16 -0700 Martin von Zweigbergk evolve: use consistent message and just re-raise InterventionRequired
Fri, 19 Apr 2019 10:47:12 -0700 Martin von Zweigbergk evolve: use standard InterventionRequired instead of MergeFailure
Fri, 19 Apr 2019 10:41:56 -0700 Martin von Zweigbergk evolve: don't use exception for local flow control
Tue, 23 Apr 2019 11:02:08 -0700 Martin von Zweigbergk evolve: reduce indentation with an early return statement
Tue, 23 Apr 2019 11:01:44 -0700 Martin von Zweigbergk evolve: remove a useless return statement at end of function
Sun, 21 Apr 2019 13:04:40 +0530 Sushil khanchi test: move a test to an appropriate test file
Sun, 21 Apr 2019 12:07:26 +0530 Sushil khanchi test: improve the title of a test
Sun, 21 Apr 2019 12:06:31 +0530 Sushil khanchi test: remove duplicated test
Sat, 09 Mar 2019 19:35:45 +0530 Sushil khanchi evolve: warn user for the metadata being lost in public divergence resolution
Wed, 17 Apr 2019 21:16:17 +0530 Sushil khanchi evolve: show a status message when merging leads to public cset
Wed, 24 Apr 2019 20:32:01 +0200 Pierre-Yves David test: use a shorter test name
Wed, 10 Apr 2019 18:20:33 +0800 Anton Shestakov stack: rename troubledcount to unstablecount
Wed, 24 Apr 2019 17:21:21 +0800 Anton Shestakov evolve: use --all by default (BC)
Wed, 24 Apr 2019 17:02:27 +0800 Anton Shestakov tests: add --rev to hg evolve to reduce test changes for the next patch
Wed, 24 Apr 2019 16:35:01 +0800 Anton Shestakov tests: add --no-all to hg evolve to reduce test changes
Wed, 24 Apr 2019 15:59:02 +0200 Anton Shestakov evolve: don't update after instability resolution by default (BC)
Sun, 14 Apr 2019 02:18:19 +0800 Anton Shestakov tests: add --update to hg evolve to reduce test changes for the next patch
Wed, 24 Apr 2019 15:57:49 +0200 Anton Shestakov tests: don't create a nested repo for no reason
Wed, 24 Apr 2019 14:38:26 +0200 Pierre-Yves David branching: merge with stable
Tue, 23 Apr 2019 15:57:04 +0200 Pierre-Yves David Added tag 8.5.1 for changeset 05c9dcf5512e stable
Tue, 23 Apr 2019 15:30:39 +0200 Pierre-Yves David packaging: prepare version 8.5.1 stable 8.5.1
Tue, 23 Apr 2019 14:18:12 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 23 Apr 2019 14:18:11 +0200 Pierre-Yves David test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Tue, 23 Apr 2019 14:18:10 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Tue, 23 Apr 2019 14:18:08 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Tue, 23 Apr 2019 14:18:06 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Tue, 23 Apr 2019 14:18:05 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.9 mercurial-4.9
Mon, 22 Apr 2019 22:14:26 -0700 Martin von Zweigbergk evolve: fix progress display with hg<4.7 stable
Sat, 20 Apr 2019 05:21:14 +0200 Pierre-Yves David packaging: mark extensions as tested with 5.0 stable
Tue, 23 Apr 2019 13:26:35 +0200 Pierre-Yves David branching: merge with stable
Tue, 23 Apr 2019 12:29:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 23 Apr 2019 12:29:48 +0200 Pierre-Yves David test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Tue, 23 Apr 2019 12:29:47 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Tue, 23 Apr 2019 12:29:45 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Mon, 11 Mar 2019 23:57:12 -0700 Martin von Zweigbergk evolve: use merge.update() for resolving phase divergence
Tue, 23 Apr 2019 12:29:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Tue, 23 Apr 2019 12:24:22 +0200 Pierre-Yves David compat: drop support for Mercurial 4.4
Tue, 23 Apr 2019 12:29:42 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.9 mercurial-4.9
Tue, 23 Apr 2019 12:20:12 +0200 Pierre-Yves David compat: backed out changeset cfcb7eedc666 stable
Tue, 23 Apr 2019 12:28:32 +0200 Pierre-Yves David test-compat: adapt test output to 4.4 mercurial-4.4
Sat, 20 Apr 2019 03:55:11 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Sat, 20 Apr 2019 03:55:10 +0200 Pierre-Yves David test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Sat, 20 Apr 2019 03:55:09 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sat, 20 Apr 2019 03:55:07 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Sat, 20 Apr 2019 03:55:06 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sat, 20 Apr 2019 03:55:04 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.9 mercurial-4.9
Fri, 19 Apr 2019 10:31:53 +0530 Sushil khanchi compat: fix a typo in compat patch stable
Thu, 18 Apr 2019 23:51:13 +0200 Pierre-Yves David changelog: mention extensions isolation (issue6121) stable
Thu, 18 Apr 2019 13:03:01 +0200 Pierre-Yves David topic: only wrap wireprotocaps for repo with topic stable
Thu, 18 Apr 2019 13:02:52 +0200 Pierre-Yves David topic: only wrap _pushb2phases for repo with topic stable
Thu, 18 Apr 2019 13:02:44 +0200 Pierre-Yves David topic: only wrap handlecheckheads for repo with topic stable
Thu, 18 Apr 2019 13:02:06 +0200 Pierre-Yves David topic: only wrap wireprotobranchmap for repo with topic stable
Thu, 18 Apr 2019 13:01:39 +0200 Pierre-Yves David topic: only wrap _headssummary for repo with topic stable
Thu, 18 Apr 2019 12:41:41 +0200 Pierre-Yves David topic: only wrap desthistedit for repo with topic stable
Thu, 18 Apr 2019 12:40:53 +0200 Pierre-Yves David topic: only wrap _destupdatetopic for repo with topic stable
Thu, 18 Apr 2019 12:39:41 +0200 Pierre-Yves David topic: only wrap _destmergebranch for repo with topic stable
Thu, 18 Apr 2019 12:36:11 +0200 Pierre-Yves David topic: only wrap gettopicrepo for repo with topic stable
Thu, 18 Apr 2019 11:13:49 +0200 Pierre-Yves David topic: only wrap mergeupdate for repo with topic stable
Thu, 18 Apr 2019 11:13:39 +0200 Pierre-Yves David topic: only wrap committext for repo with topic stable
Thu, 18 Apr 2019 11:13:24 +0200 Pierre-Yves David topic: only affect `hg commit` behavior for repo with topic stable
Thu, 18 Apr 2019 11:13:14 +0200 Pierre-Yves David topic: only wrap workingctx.__init__ for repo with topic stable
Thu, 18 Apr 2019 11:12:58 +0200 Pierre-Yves David topic: introduce a `hastopicext(repo)` function stable
Wed, 17 Apr 2019 00:20:44 +0530 Sushil khanchi tests: consolidate the public-content-divergent test cases
Wed, 17 Apr 2019 12:31:17 +0530 Sushil khanchi evolve: improve inline documentation for the public divergence resolution
Sun, 14 Apr 2019 20:26:05 +0530 Sushil khanchi cleanup: remove a duplicated line
Wed, 17 Apr 2019 21:39:28 +0200 Pierre-Yves David changelog: mention topic compatibility stable
Wed, 17 Apr 2019 20:58:10 +0200 Pierre-Yves David branching: merge stable back into default
Wed, 17 Apr 2019 20:56:24 +0200 Pierre-Yves David tescompat: revert test change for mercurial-4.9 mercurial-4.9
Wed, 17 Apr 2019 20:54:28 +0200 Pierre-Yves David branching: merge 8.5.0 expected output in stable stable
Wed, 17 Apr 2019 20:52:15 +0200 Pierre-Yves David testcompat: open a branch dedicated to mercurial 4.9 mercurial-4.9
Wed, 17 Apr 2019 18:46:41 +0800 Anton Shestakov topic: add compatibility for writing copy metadata in changelog.add() stable
Wed, 17 Apr 2019 16:18:22 +0800 Anton Shestakov serverminitopic: add compatibility for branchcache that now uses self._entries stable
Fri, 12 Apr 2019 02:21:09 +0200 Pierre-Yves David branching: merge stable into default
Fri, 12 Apr 2019 02:20:24 +0200 Pierre-Yves David packaging: mark version as development version stable
Fri, 12 Apr 2019 02:17:03 +0200 Pierre-Yves David Added tag 8.5.0 for changeset 33c617626fd9 stable
Fri, 12 Apr 2019 02:15:24 +0200 Pierre-Yves David packaging: prepare version 8.5.0 stable 8.5.0
Thu, 11 Apr 2019 22:44:53 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Fri, 12 Apr 2019 02:07:53 +0200 Pierre-Yves David branching: merge stable back into default
Thu, 11 Apr 2019 22:42:14 +0200 Pierre-Yves David test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Thu, 11 Apr 2019 22:42:13 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
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
Tue, 12 Mar 2019 09:44:05 -0700 Martin von Zweigbergk tests: reduce dependence on previous tests for setup
Thu, 28 Mar 2019 12:37:55 +0100 Pierre-Yves David branching: merge with stable
Wed, 27 Mar 2019 20:52:30 +0800 Anton Shestakov topicmap: add compatibility for branchcache that now uses self._entries stable
Wed, 27 Mar 2019 14:29:22 +0530 Sushil khanchi evolve: fix over-idented block stable
Tue, 12 Mar 2019 09:48:05 -0700 Martin von Zweigbergk tests: create "private" repository in already-updated state
Tue, 26 Mar 2019 11:23:09 +0100 Pierre-Yves David branching: merge with stable
Mon, 25 Mar 2019 15:45:11 -0700 Martin von Zweigbergk touch: use action "touch", not "<function touch at ...>", in precheck stable
Mon, 25 Mar 2019 15:44:44 -0700 Martin von Zweigbergk prune: use action "prune", not "touch", in precheck stable
Sun, 24 Mar 2019 21:30:12 +0530 Pierre-Yves David evolve: test a common case of public divergence
Sun, 24 Mar 2019 21:29:44 +0530 Sushil khanchi evolve: add condition in case of pubdiv to not swap the two div csets
Sat, 23 Mar 2019 02:10:31 +0530 Sushil khanchi evolve: add logic to handle a particular case in divergence resolution
Fri, 22 Mar 2019 00:16:44 +0530 Sushil khanchi evolve: add a test reflecting wrong behaviour of content-div resolution
Fri, 22 Mar 2019 09:45:07 -0700 Martin von Zweigbergk compat: add support for new arg name in memfilectx.__init__
Wed, 13 Mar 2019 17:32:14 +0530 Sushil khanchi evolve: preserve compatibility for hg < 4.8 versions
Sat, 09 Mar 2019 19:25:34 +0530 Sushil khanchi evolve: warn user if cset desc is being lost
Sun, 10 Mar 2019 18:00:08 +0100 Pierre-Yves David changelog: mention latest improvement
Sun, 10 Mar 2019 18:50:00 +0800 Anton Shestakov stack: make @ (current) more important than $ (some sort of unstable)
Sat, 09 Mar 2019 13:13:53 +0800 Anton Shestakov stack: show content and phase divergent state and symbol
Sat, 09 Mar 2019 12:54:00 +0800 Anton Shestakov stack: handle external-children just like other states
Thu, 07 Mar 2019 22:50:56 +0800 Anton Shestakov stack: optimize revset used for stack --children
Thu, 07 Mar 2019 19:13:45 +0800 Anton Shestakov stack: rename unstable -> orphan
Wed, 06 Mar 2019 21:47:08 +0800 Anton Shestakov evolvecmd: compatibility with older geteffectflag() that took a tuple
Wed, 06 Mar 2019 21:42:32 +0800 Anton Shestakov obshistory: remove unused geteffectflag(), it's been in core since 4.4
Wed, 06 Mar 2019 16:56:25 +0800 Anton Shestakov compat: remove old vocabulary change fallbacks
Thu, 07 Mar 2019 10:51:48 +0100 Pierre-Yves David branching: merge with stable
Thu, 07 Mar 2019 01:57:43 +0530 Sushil khanchi evolve: fix a typo from directory to dirty stable
Thu, 07 Mar 2019 01:47:14 +0530 Sushil khanchi evolve: fix the dirstate after setting parents with dirty wdir (issue5930) stable
Thu, 07 Mar 2019 01:02:05 +0530 Sushil khanchi evolve: add tests which shows evolve can get confused about copies (issue5930) stable
Tue, 05 Mar 2019 21:15:05 +0530 Sushil khanchi test: include some documentation to describe the case briefly stable
Tue, 05 Mar 2019 20:07:23 +0530 Sushil khanchi split: use ui.configoverride to preserve phase while commiting stable
Mon, 04 Mar 2019 12:30:15 +0100 Pierre-Yves David branching: merge with stable
Mon, 04 Mar 2019 11:54:49 +0100 Pierre-Yves David changelog: add entries for the recent fixes stable
Mon, 04 Mar 2019 03:16:51 +0530 Sushil khanchi evolve: make sure user can recover from conflict (issue6053) stable
Mon, 04 Mar 2019 02:55:38 +0530 Sushil khanchi evolve: add test which shows unrecoverable evolve state (issue6053) stable
Sat, 02 Mar 2019 02:34:29 +0530 Sushil khanchi evolve: add a test in pubdiv where only merging leads to conflict
Thu, 28 Feb 2019 03:12:39 +0530 Sushil khanchi evolve: cover continue case in pubdiv when merging results in same as public
Fri, 22 Feb 2019 01:02:51 +0530 Sushil khanchi evolve: handle a case in pubic-div when merging results in same as public
Thu, 28 Feb 2019 02:08:58 +0530 Sushil khanchi evolve: rename npublicdiv to publicnode
Thu, 28 Feb 2019 02:02:18 +0530 Sushil khanchi evolve: in pubdiv resolution make sure that transaction get closed
Mon, 25 Feb 2019 22:50:24 +0530 Sushil khanchi evolve: pin the public cset to local side in merging when solving public div
Sat, 23 Feb 2019 00:47:14 +0530 Sushil khanchi evolve: add tests of relocation case in public divergence
Sun, 03 Mar 2019 16:29:32 +0100 Pierre-Yves David branching: merge with stable
Sat, 02 Mar 2019 01:43:14 +0530 Sushil khanchi split: make sure hg split preserve the phase of splitting cset (issue6048) stable
Sat, 02 Mar 2019 01:37:04 +0530 Sushil khanchi split: add tests which demonstrate the issue6048 stable
Fri, 22 Feb 2019 21:01:06 +0530 Sushil khanchi evolve: fix the broken behaviour on div resolution in relocation case
Fri, 22 Feb 2019 23:49:37 +0530 Sushil khanchi evolve: change in a test which demonstrate divergence resolution can break
Fri, 22 Feb 2019 23:57:18 +0530 Sushil khanchi tests: update the title of a test as it's not what it says
Wed, 13 Feb 2019 21:56:29 +0800 Anton Shestakov obsexchange: avoid importing io/StringIO module with a different name
Wed, 13 Feb 2019 21:56:05 +0800 Anton Shestakov evolve: remove unused StringIO import
Wed, 13 Feb 2019 21:39:10 +0800 Anton Shestakov evolve: unindent some lines caught by flake8
Wed, 13 Feb 2019 12:46:57 +0100 Pierre-Yves David branching: overwrite broken merge with a correct one
Wed, 13 Feb 2019 19:18:17 +0800 Anton Shestakov branching: merge with stable
Tue, 12 Feb 2019 15:03:14 +0100 Pierre-Yves David branching: merge with stable
Mon, 11 Feb 2019 21:33:02 +0800 Anton Shestakov obshistory: omit keyword arguments with default values in patch.diffui() calls stable
Fri, 08 Feb 2019 17:52:49 +0100 Pierre-Yves David branching: merge with stable
Fri, 08 Feb 2019 10:21:09 +0100 Pierre-Yves David test: wider another time matching in prev/next lock testing stable
Fri, 08 Feb 2019 09:29:54 +0100 Pierre-Yves David branching: merge with stable
Fri, 08 Feb 2019 09:26:48 +0100 Pierre-Yves David test: wider time matching in prev/next lock testing stable
Wed, 21 Nov 2018 12:00:46 +0000 Martijn Pieters topic: make topics compatible with branchmap refactor
Wed, 30 Jan 2019 10:03:00 -0800 Martin von Zweigbergk prompts: use 1-indexing in revselectionprompt()
Thu, 07 Feb 2019 16:24:59 +0800 Anton Shestakov test-split: split now ignores diff.* settings
Sun, 03 Feb 2019 17:03:02 +0530 Sangeet Kumar Mishra pick: add --tool for hg pick to specify mergetool
Wed, 06 Feb 2019 13:49:29 +0800 Anton Shestakov revset: use getintrange() to parse relation subscript
Sun, 03 Feb 2019 12:04:50 +0100 Pierre-Yves David branching: merge with stable
Thu, 31 Jan 2019 15:38:48 +0530 Sushil khanchi compat: pass contexts to _findlimit() (issue6066) stable
Sun, 03 Feb 2019 08:10:48 +0100 Pierre-Yves David packaging: fix debian changelog stable
Wed, 30 Jan 2019 04:45:40 +0100 Pierre-Yves David changelog: add relevant entries
Tue, 22 Jan 2019 18:40:10 +0530 Sushil khanchi evolve: add test for the case where public divergence on difference parents
Mon, 21 Jan 2019 23:06:10 +0530 Sushil khanchi evolve: update the public divergence resolution logic to cover --continue case
Mon, 21 Jan 2019 23:06:34 +0530 Sushil khanchi evolve: add logic to resolve content-divergence with a public cset
Sun, 13 Jan 2019 19:33:19 +0530 Sushil khanchi evolve: introduce function to create a obsmarker relation even for public cset
Tue, 29 Jan 2019 20:45:14 +0800 Anton Shestakov topic: make ranges work in revset relations like 'foo#stack[1:2]'
Mon, 28 Jan 2019 22:31:31 +0800 Anton Shestakov topic: simplify #stack index check/access
Sun, 27 Jan 2019 17:39:09 +0800 Anton Shestakov topic: make ranges work in revset relations like 'foo#topic[1:2]'
Fri, 25 Jan 2019 16:51:36 +0530 Sushil khanchi evolve: add description of function solveobswdp
Wed, 23 Jan 2019 12:11:36 -0800 Martin von Zweigbergk evolve: document the "if not shouldupdate" block
Wed, 23 Jan 2019 11:55:20 -0800 Martin von Zweigbergk evolve: make "startnode" consistently be a node, not a context
less more | rev 4615: (0) -3000 -1000 -240 +240 +1000 tip