evolve: revision graph

graph

less more | rev 4695: (0) -3000 -1000 -240 +240 +1000 tip

evolve: fix the code flow pattern of solving obswdir par and troubled revs
Sun, 16 Jun 2019 23:39:55 +0530, by Sushil khanchi
evolve: refactor for consistent behavior of evolve when wdp is obsolete
Sun, 09 Jun 2019 12:07:08 +0530, by Sushil khanchi
evolve: backout 3027005c42c3 to reintroduce a bug for right fix
Sat, 15 Jun 2019 17:17:19 +0530, by Sushil khanchi
pick: register pickstate as an unfinished state stable
Fri, 14 Jun 2019 18:17:03 +0800, by Anton Shestakov
pick: rename variable for unfinishedstates stable
Fri, 14 Jun 2019 18:14:57 +0800, by Anton Shestakov
pick: actually delete pickstate if --abort is given stable
Fri, 14 Jun 2019 18:26:24 +0800, by Anton Shestakov
evolve: orphans that evolve into nothing don't need successors (issue5967) stable
Tue, 18 Jun 2019 17:17:31 +0800, by Anton Shestakov
tests: demonstrate obsmarker creation after discarding conflicting changes stable
Sat, 22 Dec 2018 18:31:32 +0800, by Anton Shestakov
pick: remove transaction on the whole command (issue6037) stable
Fri, 07 Jun 2019 18:14:48 +0800, by Anton Shestakov
tests: demonstrate hg pick forgetting files after conflicts stable
Sun, 23 Dec 2018 01:02:36 +0800, by Anton Shestakov
packaging: follow hg's supported python version (>= 2.7) stable
Thu, 13 Jun 2019 13:27:26 +0800, by Anton Shestakov
packaging: require hg 4.5 also for usage, not just for building stable
Thu, 13 Jun 2019 13:19:44 +0800, by Anton Shestakov
packaging: require mercurial >= 4.5 stable
Tue, 11 Jun 2019 10:04:11 +0200, by Philippe Pepiot
evolve: clarify why returning by adding inline doc
Sat, 08 Jun 2019 16:03:05 +0530, by Sushil khanchi
evolve: move a code block to have right value in has_some_val
Sat, 08 Jun 2019 15:59:31 +0530, by Sushil khanchi
topic: add tests which demonstrate topicset failure of FilteredRepoLookupError
Sat, 27 Apr 2019 13:09:34 +0530, by Sushil khanchi
pick: reduce configoverride() scope
Sat, 08 Jun 2019 16:57:34 +0800, by Anton Shestakov
evolve: correct action verb in a message
Sat, 08 Jun 2019 16:09:37 +0800, by Anton Shestakov
evolve: internationalize a message
Sat, 08 Jun 2019 16:06:24 +0800, by Anton Shestakov
evolvecmd: the proper way to deal with conflicts is to resolve them
Thu, 06 Jun 2019 17:37:42 +0800, by Anton Shestakov
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 05 Jun 2019 17:56:44 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Wed, 05 Jun 2019 17:46:06 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Wed, 05 Jun 2019 17:45:45 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Wed, 05 Jun 2019 17:42:50 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Wed, 05 Jun 2019 17:39:32 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
Wed, 05 Jun 2019 17:38:32 +0200, by Pierre-Yves David
branching: merge with 9.0.0
Fri, 07 Jun 2019 02:25:02 +0200, by Pierre-Yves David
branching: merge back with stable
Fri, 07 Jun 2019 02:24:08 +0200, by Pierre-Yves David
packaging: mark as development versions stable
Fri, 07 Jun 2019 02:22:05 +0200, by Pierre-Yves David
Added tag 9.0.0 for changeset 756db65030c6 stable
Fri, 07 Jun 2019 02:15:50 +0200, by Pierre-Yves David
packaging: prepare release 9.0.0 stable 9.0.0
Thu, 06 Jun 2019 14:24:19 +0200, by Pierre-Yves David
doc: clarify the status of configuration of the obshashrange protocol stable
Thu, 06 Jun 2019 14:32:25 +0200, by Pierre-Yves David
changelog: add various missing bits stable
Thu, 06 Jun 2019 13:26:44 +0200, by Pierre-Yves David
templatekw: keep compatibility with Mercurial 4.5 stable
Wed, 05 Jun 2019 19:45:35 +0200, by Pierre-Yves David
test: adjust output to stable branch stable
Wed, 05 Jun 2019 17:21:45 +0200, by Pierre-Yves David
branching: merge with stable
Tue, 04 Jun 2019 11:08:44 +0200, by Pierre-Yves David
templates: don't alias keywords directly stable
Sat, 01 Jun 2019 02:30:14 +0200, by Joerg Sonnenberger
stack: remove 'topic.' prefix from colors/labels
Tue, 28 May 2019 16:46:18 +0800, by Anton Shestakov
stack: handle hash sizes when --debug flag is provided
Sat, 18 May 2019 16:56:47 +0800, by Anton Shestakov
stack: always provide (full) node hash to non-default --template
Fri, 17 May 2019 17:50:25 +0800, by Anton Shestakov
stack: remove unnecessary prefix from stack output with non-default --template
Fri, 17 May 2019 17:42:06 +0800, by Anton Shestakov
stack: provide context to formatter with non-default --template
Fri, 17 May 2019 17:59:58 +0800, by Anton Shestakov
stack: leverage labelsgen() to produce all needed labels for fm.write()
Sat, 11 May 2019 17:14:32 +0800, by Anton Shestakov
stack: check if stack is empty more pythonically
Wed, 08 May 2019 16:00:34 +0800, by Anton Shestakov
stack: implement __bool__ and __nonzero__
Wed, 08 May 2019 15:57:54 +0800, by Anton Shestakov
stack: get stack data directly from stack and remove stackdata()
Sun, 05 May 2019 17:39:46 +0800, by Anton Shestakov
stack: use stack._revs instead of stack.revs[1:] in external children revset
Sun, 05 May 2019 16:14:53 +0800, by Anton Shestakov
test: update output to match the parent changesets
Tue, 04 Jun 2019 10:30:56 +0200, by Pierre-Yves David
topic: add a simple option to reject publishing
Mon, 27 May 2019 03:42:35 +0200, by Pierre-Yves David
compat: adjust `wrapadd` for upstream
Tue, 04 Jun 2019 10:07:08 +0200, by Pierre-Yves David
debian: override default value for SPHINXBUILD in docs/makefile stable
Sun, 05 May 2019 22:48:41 +0530, by Faheem Mitha
obshashtree: move obshashtree in its own module
Mon, 27 May 2019 02:19:48 +0200, by Pierre-Yves David
obsdiscovery: drop `obshash` discovery protocol (issue6136)
Mon, 27 May 2019 01:53:36 +0200, by Pierre-Yves David
cmdrewrite: use context manager for some locks and transactions
Thu, 09 May 2019 09:42:51 -0700, by Martin von Zweigbergk
evolve: mention that --all is default, in list of options
Mon, 29 Apr 2019 23:43:16 +0530, by Sushil khanchi
touch: use util.acceptintervention() for closing the transaction
Mon, 13 May 2019 18:47:58 +0530, by Sushil khanchi
touch: use context manager for locks
Mon, 13 May 2019 18:45:00 +0530, by Sushil khanchi
touch: extract the logic of touching rev's to its own function
Mon, 13 May 2019 18:39:43 +0530, by Sushil khanchi
changelog: mention user merging in the changelog
Mon, 27 May 2019 02:42:11 +0200, by Pierre-Yves David
evolve: consider using three way merge to get the user for div resolution
Sun, 05 May 2019 18:24:59 +0530, by Sushil khanchi
evolve: add tests for the case when div csets has different users
Sun, 05 May 2019 18:24:50 +0530, by Sushil khanchi
branching: merge with stable
Fri, 03 May 2019 01:23:12 +0200, by Pierre-Yves David
evolve: move status msg to verbose mode in content-divergence resolution
Fri, 26 Apr 2019 01:20:08 +0530, by Sushil khanchi
debian: Override default value for SPHINXBUILD in docs/makefile stable
Fri, 03 May 2019 03:52:44 +0530, by Faheem Mitha
docs: add SPHINXBUILD make variable stable
Fri, 03 May 2019 03:44:48 +0530, by Faheem Mitha
topic: add test to increase code coverage in case of multiple topics stable
Sat, 27 Apr 2019 20:56:37 +0530, by Sushil khanchi
changelog: --no-update is the default, recommend --update instead
Sat, 27 Apr 2019 17:11:12 +0800, by Anton Shestakov
topic: drop support for accessing csets in branch stack using bxx (issue6119)
Sat, 27 Apr 2019 01:18:08 +0300, by Pulkit Goyal
legacy: drop the check for `obsolete._enabled` stable
Mon, 29 Apr 2019 23:16:29 -0400, by Matt Harbison
docs: drop references to the old temporary commit that was created with amend
Sun, 28 Apr 2019 00:21:28 -0400, by Matt Harbison
templatekw: add `instabilities` alias for `troubles`
Sat, 27 Apr 2019 22:45:16 -0400, by Matt Harbison
revset: switch internal uses and tests to `predecessors` from legacy name
Sat, 27 Apr 2019 22:59:48 -0400, by Matt Harbison
revset: add `predecessor` aliases for `precursors` and `allprecursors`
Sat, 27 Apr 2019 22:33:16 -0400, by Matt Harbison
revset: add `unstable` alias for `troubled`
Sat, 27 Apr 2019 22:24:30 -0400, by Matt Harbison
docs: change `bumped` references to `phase-divergent`
Sat, 27 Apr 2019 21:54:52 -0400, by Matt Harbison
docs: change `divergent` references to `content-divergent`
Sat, 27 Apr 2019 21:41:04 -0400, by Matt Harbison
docs: change `troubled` references to `unstable`
Sat, 27 Apr 2019 21:27:54 -0400, by Matt Harbison
docs: change `unstable` references to `orphan`
Sat, 27 Apr 2019 21:24:18 -0400, by Matt Harbison
doc: correct a typo
Sat, 27 Apr 2019 21:09:47 -0400, by Matt Harbison
docs: change `troubles` references to `instability`
Sat, 27 Apr 2019 19:42:42 -0400, by Matt Harbison
docs: change `precursors` references to `predecessors`
Sat, 27 Apr 2019 19:32:03 -0400, by Matt Harbison
docs: import figure diagrams with inkscape 0.92
Sat, 27 Apr 2019 14:42:48 -0400, by Matt Harbison
messages: standardize on "working copy is now at" including "is"
Thu, 25 Apr 2019 15:14:21 -0700, by Martin von Zweigbergk
evolve: move more of the progress-related variables together
Thu, 25 Apr 2019 13:58:29 -0700, by Martin von Zweigbergk
evolve: delete dead calculation of number of troubled revisions
Thu, 25 Apr 2019 14:02:11 -0700, by Martin von Zweigbergk
evolve: drop nested locks and transactions
Fri, 19 Apr 2019 10:23:53 -0700, by Martin von Zweigbergk
next: start transaction before calling _solveone()
Fri, 19 Apr 2019 11:12:00 -0700, by Martin von Zweigbergk
evolve: use single transaction also when continuing
Fri, 19 Apr 2019 10:22:25 -0700, by Martin von Zweigbergk
evolve: run in a single transaction
Fri, 19 Apr 2019 09:41:39 -0700, by Martin von Zweigbergk
evolve: extract function for solving one revision, including merges
Fri, 19 Apr 2019 10:01:32 -0700, by Martin von Zweigbergk
evolve: mention that --all is the default behavior now
Thu, 25 Apr 2019 17:20:32 +0800, by Anton Shestakov
evolve: mention that not all successful operations currently update wdir
Thu, 25 Apr 2019 17:19:41 +0800, by Anton Shestakov
evolve: add progress support for --continue
Tue, 23 Apr 2019 11:07:28 -0700, by Martin von Zweigbergk
evolve: reduce scope of progress-related variables
Tue, 23 Apr 2019 10:56:42 -0700, by Martin von Zweigbergk
evolve: move progress-clearing out of _cleanup()
Tue, 23 Apr 2019 10:49:47 -0700, by Martin von Zweigbergk
evolve: stop passing no-op "progresscb" into continueevolve()
Tue, 23 Apr 2019 10:52:33 -0700, by Martin von Zweigbergk
evolve: _solveunstable() update progress only once
Tue, 23 Apr 2019 09:45:45 -0700, by Martin von Zweigbergk
evolve: don't update progress just before clearing it
Tue, 23 Apr 2019 09:35:34 -0700, by Martin von Zweigbergk
evolve: clean up progress bar also when using -r
Tue, 23 Apr 2019 09:31:32 -0700, by Martin von Zweigbergk
tests: add some basic testing of progress
Tue, 23 Apr 2019 10:20:03 -0700, by Martin von Zweigbergk
evolve: increment progress *after* a whole merge commit is done
Fri, 19 Apr 2019 10:03:39 -0700, by Martin von Zweigbergk
evolve: use util.acceptintervention() for closing transactions
Fri, 19 Apr 2019 11:02:35 -0700, by Martin von Zweigbergk
evolve: use context manager for transactions
Fri, 19 Apr 2019 10:32:32 -0700, by Martin von Zweigbergk
evolve: use consistent message and just re-raise InterventionRequired
Fri, 19 Apr 2019 10:52:16 -0700, by Martin von Zweigbergk
evolve: use standard InterventionRequired instead of MergeFailure
Fri, 19 Apr 2019 10:47:12 -0700, by Martin von Zweigbergk
evolve: don't use exception for local flow control
Fri, 19 Apr 2019 10:41:56 -0700, by Martin von Zweigbergk
evolve: reduce indentation with an early return statement
Tue, 23 Apr 2019 11:02:08 -0700, by Martin von Zweigbergk
evolve: remove a useless return statement at end of function
Tue, 23 Apr 2019 11:01:44 -0700, by Martin von Zweigbergk
test: move a test to an appropriate test file
Sun, 21 Apr 2019 13:04:40 +0530, by Sushil khanchi
test: improve the title of a test
Sun, 21 Apr 2019 12:07:26 +0530, by Sushil khanchi
test: remove duplicated test
Sun, 21 Apr 2019 12:06:31 +0530, by Sushil khanchi
evolve: warn user for the metadata being lost in public divergence resolution
Sat, 09 Mar 2019 19:35:45 +0530, by Sushil khanchi
evolve: show a status message when merging leads to public cset
Wed, 17 Apr 2019 21:16:17 +0530, by Sushil khanchi
test: use a shorter test name
Wed, 24 Apr 2019 20:32:01 +0200, by Pierre-Yves David
stack: rename troubledcount to unstablecount
Wed, 10 Apr 2019 18:20:33 +0800, by Anton Shestakov
evolve: use --all by default (BC)
Wed, 24 Apr 2019 17:21:21 +0800, by Anton Shestakov
tests: add --rev to hg evolve to reduce test changes for the next patch
Wed, 24 Apr 2019 17:02:27 +0800, by Anton Shestakov
tests: add --no-all to hg evolve to reduce test changes
Wed, 24 Apr 2019 16:35:01 +0800, by Anton Shestakov
evolve: don't update after instability resolution by default (BC)
Wed, 24 Apr 2019 15:59:02 +0200, by Anton Shestakov
tests: add --update to hg evolve to reduce test changes for the next patch
Sun, 14 Apr 2019 02:18:19 +0800, by Anton Shestakov
tests: don't create a nested repo for no reason
Wed, 24 Apr 2019 15:57:49 +0200, by Anton Shestakov
branching: merge with stable
Wed, 24 Apr 2019 14:38:26 +0200, by Pierre-Yves David
Added tag 8.5.1 for changeset 05c9dcf5512e stable
Tue, 23 Apr 2019 15:57:04 +0200, by Pierre-Yves David
packaging: prepare version 8.5.1 stable 8.5.1
Tue, 23 Apr 2019 15:30:39 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 23 Apr 2019 14:18:12 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Tue, 23 Apr 2019 14:18:11 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Tue, 23 Apr 2019 14:18:10 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Tue, 23 Apr 2019 14:18:08 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Tue, 23 Apr 2019 14:18:06 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
Tue, 23 Apr 2019 14:18:05 +0200, by Pierre-Yves David
evolve: fix progress display with hg<4.7 stable
Mon, 22 Apr 2019 22:14:26 -0700, by Martin von Zweigbergk
packaging: mark extensions as tested with 5.0 stable
Sat, 20 Apr 2019 05:21:14 +0200, by Pierre-Yves David
branching: merge with stable
Tue, 23 Apr 2019 13:26:35 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Tue, 23 Apr 2019 12:29:50 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Tue, 23 Apr 2019 12:29:48 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Tue, 23 Apr 2019 12:29:47 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Tue, 23 Apr 2019 12:29:45 +0200, by Pierre-Yves David
evolve: use merge.update() for resolving phase divergence
Mon, 11 Mar 2019 23:57:12 -0700, by Martin von Zweigbergk
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Tue, 23 Apr 2019 12:29:44 +0200, by Pierre-Yves David
compat: drop support for Mercurial 4.4
Tue, 23 Apr 2019 12:24:22 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
Tue, 23 Apr 2019 12:29:42 +0200, by Pierre-Yves David
compat: backed out changeset cfcb7eedc666 stable
Tue, 23 Apr 2019 12:20:12 +0200, by Pierre-Yves David
test-compat: adapt test output to 4.4 mercurial-4.4
Tue, 23 Apr 2019 12:28:32 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Sat, 20 Apr 2019 03:55:11 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Sat, 20 Apr 2019 03:55:10 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Sat, 20 Apr 2019 03:55:09 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Sat, 20 Apr 2019 03:55:07 +0200, by Pierre-Yves David
test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Sat, 20 Apr 2019 03:55:06 +0200, by Pierre-Yves David
test-compat: merge stable into mercurial-4.9 mercurial-4.9
Sat, 20 Apr 2019 03:55:04 +0200, by Pierre-Yves David
compat: fix a typo in compat patch stable
Fri, 19 Apr 2019 10:31:53 +0530, by Sushil khanchi
changelog: mention extensions isolation (issue6121) stable
Thu, 18 Apr 2019 23:51:13 +0200, by Pierre-Yves David
topic: only wrap wireprotocaps for repo with topic stable
Thu, 18 Apr 2019 13:03:01 +0200, by Pierre-Yves David
topic: only wrap _pushb2phases for repo with topic stable
Thu, 18 Apr 2019 13:02:52 +0200, by Pierre-Yves David
topic: only wrap handlecheckheads for repo with topic stable
Thu, 18 Apr 2019 13:02:44 +0200, by Pierre-Yves David
topic: only wrap wireprotobranchmap for repo with topic stable
Thu, 18 Apr 2019 13:02:06 +0200, by Pierre-Yves David
topic: only wrap _headssummary for repo with topic stable
Thu, 18 Apr 2019 13:01:39 +0200, by Pierre-Yves David
topic: only wrap desthistedit for repo with topic stable
Thu, 18 Apr 2019 12:41:41 +0200, by Pierre-Yves David
topic: only wrap _destupdatetopic for repo with topic stable
Thu, 18 Apr 2019 12:40:53 +0200, by Pierre-Yves David
topic: only wrap _destmergebranch for repo with topic stable
Thu, 18 Apr 2019 12:39:41 +0200, by Pierre-Yves David
topic: only wrap gettopicrepo for repo with topic stable
Thu, 18 Apr 2019 12:36:11 +0200, by Pierre-Yves David
topic: only wrap mergeupdate for repo with topic stable
Thu, 18 Apr 2019 11:13:49 +0200, by Pierre-Yves David
topic: only wrap committext for repo with topic stable
Thu, 18 Apr 2019 11:13:39 +0200, by Pierre-Yves David
topic: only affect `hg commit` behavior for repo with topic stable
Thu, 18 Apr 2019 11:13:24 +0200, by Pierre-Yves David
topic: only wrap workingctx.__init__ for repo with topic stable
Thu, 18 Apr 2019 11:13:14 +0200, by Pierre-Yves David
topic: introduce a `hastopicext(repo)` function stable
Thu, 18 Apr 2019 11:12:58 +0200, by Pierre-Yves David
tests: consolidate the public-content-divergent test cases
Wed, 17 Apr 2019 00:20:44 +0530, by Sushil khanchi
evolve: improve inline documentation for the public divergence resolution
Wed, 17 Apr 2019 12:31:17 +0530, by Sushil khanchi
cleanup: remove a duplicated line
Sun, 14 Apr 2019 20:26:05 +0530, by Sushil khanchi
changelog: mention topic compatibility stable
Wed, 17 Apr 2019 21:39:28 +0200, by Pierre-Yves David
branching: merge stable back into default
Wed, 17 Apr 2019 20:58:10 +0200, by Pierre-Yves David
tescompat: revert test change for mercurial-4.9 mercurial-4.9
Wed, 17 Apr 2019 20:56:24 +0200, by Pierre-Yves David
branching: merge 8.5.0 expected output in stable stable
Wed, 17 Apr 2019 20:54:28 +0200, by Pierre-Yves David
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

less more | rev 4695: (0) -3000 -1000 -240 +240 +1000 tip

Mercurial > evolve

graph