Mercurial > evolve

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 4702: (0) -3000 -1000 -112 +112 +1000 tip
age author description
Mon, 01 Jul 2019 19:15:57 +0530 Sushil khanchi evolve: fix the inconsistent behaviour of prune (issue6137) stable
Tue, 02 Jul 2019 21:00:46 +0530 Sushil khanchi prune: add tests to demonstrate issue6137 stable
Sun, 30 Jun 2019 23:50:57 +0530 Sushil khanchi compat: fix `setupevolveunfinished` for upstream
Sat, 29 Jun 2019 18:21:57 +0800 Anton Shestakov prune: update to the successor of wdir also with --pair/--biject (issue6142) stable
Sat, 22 Jun 2019 18:37:21 +0800 Anton Shestakov tests: demonstrate prune --pair not moving bookmark correctly stable
Tue, 02 Jul 2019 10:17:42 +0200 Pierre-Yves David oops: backed out changeset 7ac40b4ea24c
Sun, 30 Jun 2019 23:50:57 +0530 Sushil khanchi compat: fix `setupevolveunfinished` for upstream
Sun, 16 Jun 2019 23:39:55 +0530 Sushil khanchi evolve: fix the code flow pattern of solving obswdir par and troubled revs
Sun, 09 Jun 2019 12:07:08 +0530 Sushil khanchi evolve: refactor for consistent behavior of evolve when wdp is obsolete
Sat, 15 Jun 2019 17:17:19 +0530 Sushil khanchi evolve: backout 3027005c42c3 to reintroduce a bug for right fix
Fri, 14 Jun 2019 18:17:03 +0800 Anton Shestakov pick: register pickstate as an unfinished state stable
Fri, 14 Jun 2019 18:14:57 +0800 Anton Shestakov pick: rename variable for unfinishedstates stable
Fri, 14 Jun 2019 18:26:24 +0800 Anton Shestakov pick: actually delete pickstate if --abort is given stable
Tue, 18 Jun 2019 17:17:31 +0800 Anton Shestakov evolve: orphans that evolve into nothing don't need successors (issue5967) stable
Sat, 22 Dec 2018 18:31:32 +0800 Anton Shestakov tests: demonstrate obsmarker creation after discarding conflicting changes stable
Fri, 07 Jun 2019 18:14:48 +0800 Anton Shestakov pick: remove transaction on the whole command (issue6037) stable
Sun, 23 Dec 2018 01:02:36 +0800 Anton Shestakov tests: demonstrate hg pick forgetting files after conflicts stable
Thu, 13 Jun 2019 13:27:26 +0800 Anton Shestakov packaging: follow hg's supported python version (>= 2.7) stable
Thu, 13 Jun 2019 13:19:44 +0800 Anton Shestakov packaging: require hg 4.5 also for usage, not just for building stable
Tue, 11 Jun 2019 10:04:11 +0200 Philippe Pepiot packaging: require mercurial >= 4.5 stable
Sat, 08 Jun 2019 16:03:05 +0530 Sushil khanchi evolve: clarify why returning by adding inline doc
Sat, 08 Jun 2019 15:59:31 +0530 Sushil khanchi evolve: move a code block to have right value in has_some_val
Sat, 27 Apr 2019 13:09:34 +0530 Sushil khanchi topic: add tests which demonstrate topicset failure of FilteredRepoLookupError
Sat, 08 Jun 2019 16:57:34 +0800 Anton Shestakov pick: reduce configoverride() scope
Sat, 08 Jun 2019 16:09:37 +0800 Anton Shestakov evolve: correct action verb in a message
Sat, 08 Jun 2019 16:06:24 +0800 Anton Shestakov evolve: internationalize a message
Thu, 06 Jun 2019 17:37:42 +0800 Anton Shestakov evolvecmd: the proper way to deal with conflicts is to resolve them
Wed, 05 Jun 2019 17:56:44 +0200 Pierre-Yves David test-compat: merge mercurial-4.5 into mercurial-4.4 mercurial-4.4
Wed, 05 Jun 2019 17:46:06 +0200 Pierre-Yves David test-compat: merge mercurial-4.6 into mercurial-4.5 mercurial-4.5
Wed, 05 Jun 2019 17:45:45 +0200 Pierre-Yves David test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
Wed, 05 Jun 2019 17:42:50 +0200 Pierre-Yves David test-compat: merge mercurial-4.8 into mercurial-4.7 mercurial-4.7
Wed, 05 Jun 2019 17:39:32 +0200 Pierre-Yves David test-compat: merge mercurial-4.9 into mercurial-4.8 mercurial-4.8
Wed, 05 Jun 2019 17:38:32 +0200 Pierre-Yves David test-compat: merge stable into mercurial-4.9 mercurial-4.9
Fri, 07 Jun 2019 02:25:02 +0200 Pierre-Yves David branching: merge with 9.0.0
Fri, 07 Jun 2019 02:24:08 +0200 Pierre-Yves David branching: merge back with stable
Fri, 07 Jun 2019 02:22:05 +0200 Pierre-Yves David packaging: mark as development versions stable
Fri, 07 Jun 2019 02:15:50 +0200 Pierre-Yves David Added tag 9.0.0 for changeset 756db65030c6 stable
Thu, 06 Jun 2019 14:24:19 +0200 Pierre-Yves David packaging: prepare release 9.0.0 stable 9.0.0
Thu, 06 Jun 2019 14:32:25 +0200 Pierre-Yves David doc: clarify the status of configuration of the obshashrange protocol stable
Thu, 06 Jun 2019 13:26:44 +0200 Pierre-Yves David changelog: add various missing bits stable
Wed, 05 Jun 2019 19:45:35 +0200 Pierre-Yves David templatekw: keep compatibility with Mercurial 4.5 stable
Wed, 05 Jun 2019 17:21:45 +0200 Pierre-Yves David test: adjust output to stable branch stable
Tue, 04 Jun 2019 11:08:44 +0200 Pierre-Yves David branching: merge with stable
Sat, 01 Jun 2019 02:30:14 +0200 Joerg Sonnenberger templates: don't alias keywords directly stable
Tue, 28 May 2019 16:46:18 +0800 Anton Shestakov stack: remove 'topic.' prefix from colors/labels
Sat, 18 May 2019 16:56:47 +0800 Anton Shestakov stack: handle hash sizes when --debug flag is provided
Fri, 17 May 2019 17:50:25 +0800 Anton Shestakov stack: always provide (full) node hash to non-default --template
Fri, 17 May 2019 17:42:06 +0800 Anton Shestakov stack: remove unnecessary prefix from stack output with non-default --template
Fri, 17 May 2019 17:59:58 +0800 Anton Shestakov stack: provide context to formatter with non-default --template
Sat, 11 May 2019 17:14:32 +0800 Anton Shestakov stack: leverage labelsgen() to produce all needed labels for fm.write()
Wed, 08 May 2019 16:00:34 +0800 Anton Shestakov stack: check if stack is empty more pythonically
Wed, 08 May 2019 15:57:54 +0800 Anton Shestakov stack: implement __bool__ and __nonzero__
Sun, 05 May 2019 17:39:46 +0800 Anton Shestakov stack: get stack data directly from stack and remove stackdata()
Sun, 05 May 2019 16:14:53 +0800 Anton Shestakov stack: use stack._revs instead of stack.revs[1:] in external children revset
Tue, 04 Jun 2019 10:30:56 +0200 Pierre-Yves David test: update output to match the parent changesets
Mon, 27 May 2019 03:42:35 +0200 Pierre-Yves David topic: add a simple option to reject publishing
Tue, 04 Jun 2019 10:07:08 +0200 Pierre-Yves David compat: adjust `wrapadd` for upstream
Sun, 05 May 2019 22:48:41 +0530 Faheem Mitha debian: override default value for SPHINXBUILD in docs/makefile stable
Mon, 27 May 2019 02:19:48 +0200 Pierre-Yves David obshashtree: move obshashtree in its own module
Mon, 27 May 2019 01:53:36 +0200 Pierre-Yves David obsdiscovery: drop `obshash` discovery protocol (issue6136)
Thu, 09 May 2019 09:42:51 -0700 Martin von Zweigbergk cmdrewrite: use context manager for some locks and transactions
Mon, 29 Apr 2019 23:43:16 +0530 Sushil khanchi evolve: mention that --all is default, in list of options
Mon, 13 May 2019 18:47:58 +0530 Sushil khanchi touch: use util.acceptintervention() for closing the transaction
Mon, 13 May 2019 18:45:00 +0530 Sushil khanchi touch: use context manager for locks
Mon, 13 May 2019 18:39:43 +0530 Sushil khanchi touch: extract the logic of touching rev's to its own function
Mon, 27 May 2019 02:42:11 +0200 Pierre-Yves David changelog: mention user merging in the changelog
Sun, 05 May 2019 18:24:59 +0530 Sushil khanchi evolve: consider using three way merge to get the user for div resolution
Sun, 05 May 2019 18:24:50 +0530 Sushil khanchi evolve: add tests for the case when div csets has different users
Fri, 03 May 2019 01:23:12 +0200 Pierre-Yves David branching: merge with stable
Fri, 26 Apr 2019 01:20:08 +0530 Sushil khanchi evolve: move status msg to verbose mode in content-divergence resolution
Fri, 03 May 2019 03:52:44 +0530 Faheem Mitha debian: Override default value for SPHINXBUILD in docs/makefile stable
Fri, 03 May 2019 03:44:48 +0530 Faheem Mitha docs: add SPHINXBUILD make variable stable
Sat, 27 Apr 2019 20:56:37 +0530 Sushil khanchi topic: add test to increase code coverage in case of multiple topics stable
Sat, 27 Apr 2019 17:11:12 +0800 Anton Shestakov changelog: --no-update is the default, recommend --update instead
Sat, 27 Apr 2019 01:18:08 +0300 Pulkit Goyal topic: drop support for accessing csets in branch stack using bxx (issue6119)
Mon, 29 Apr 2019 23:16:29 -0400 Matt Harbison legacy: drop the check for `obsolete._enabled` stable
Sun, 28 Apr 2019 00:21:28 -0400 Matt Harbison docs: drop references to the old temporary commit that was created with amend
Sat, 27 Apr 2019 22:45:16 -0400 Matt Harbison templatekw: add `instabilities` alias for `troubles`
Sat, 27 Apr 2019 22:59:48 -0400 Matt Harbison revset: switch internal uses and tests to `predecessors` from legacy name
Sat, 27 Apr 2019 22:33:16 -0400 Matt Harbison revset: add `predecessor` aliases for `precursors` and `allprecursors`
Sat, 27 Apr 2019 22:24:30 -0400 Matt Harbison revset: add `unstable` alias for `troubled`
Sat, 27 Apr 2019 21:54:52 -0400 Matt Harbison docs: change `bumped` references to `phase-divergent`
Sat, 27 Apr 2019 21:41:04 -0400 Matt Harbison docs: change `divergent` references to `content-divergent`
Sat, 27 Apr 2019 21:27:54 -0400 Matt Harbison docs: change `troubled` references to `unstable`
Sat, 27 Apr 2019 21:24:18 -0400 Matt Harbison docs: change `unstable` references to `orphan`
Sat, 27 Apr 2019 21:09:47 -0400 Matt Harbison doc: correct a typo
Sat, 27 Apr 2019 19:42:42 -0400 Matt Harbison docs: change `troubles` references to `instability`
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
less more | rev 4702: (0) -3000 -1000 -112 +112 +1000 tip