Wed, 06 Jun 2018 04:09:49 +0530 |
Pulkit Goyal |
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
|
Tue, 05 Jun 2018 00:53:21 +0530 |
Pulkit Goyal |
evolve: use cmdrewrite.amend() instead of creating a new commit
|
Mon, 23 Apr 2018 14:48:53 +0530 |
Pulkit Goyal |
evolve: create new commit while resolving content-divergence
|
Tue, 22 May 2018 20:33:42 +0530 |
Pulkit Goyal |
content-divergence: store the resolved revs in evolvestate['replacements']
|
Mon, 21 May 2018 14:56:51 +0200 |
Boris Feld |
test: update to new outputs
|
Sun, 29 Apr 2018 19:18:54 +0530 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
Sun, 29 Apr 2018 19:14:41 +0530 |
Pulkit Goyal |
evolve: show cset hash in "update to local conflict" message
|
Sun, 29 Apr 2018 19:11:29 +0530 |
Pulkit Goyal |
evolve: use hg.updaterepo() instead of hg.update() to hide stats
|
Sun, 29 Apr 2018 19:04:18 +0530 |
Pulkit Goyal |
evolve: fix the conflicts error message during content-divergence resolution
|
Sun, 29 Apr 2018 18:51:56 +0530 |
Pulkit Goyal |
evolve: add logic to continue interrupted content-divergence resolution
|
Wed, 25 Apr 2018 01:58:45 +0100 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
Mon, 23 Apr 2018 12:23:00 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
Mon, 23 Apr 2018 12:11:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
Sun, 22 Apr 2018 11:40:17 +0200 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
Wed, 28 Mar 2018 14:11:13 +0530 |
Pulkit Goyal |
evolve: show a message when evolution leads to no changes to commit
|
Fri, 23 Mar 2018 17:46:46 +0530 |
Pulkit Goyal |
evolve: use the new rebased changeset to resolve phase-divergence
|
Fri, 23 Mar 2018 17:20:20 +0530 |
Pulkit Goyal |
tests: add one more test case about handling of phase-divergence by evolve
|
Wed, 21 Mar 2018 16:32:54 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
Wed, 21 Mar 2018 16:18:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
Wed, 21 Mar 2018 16:06:17 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.4
mercurial-4.4
|
Mon, 12 Mar 2018 15:40:28 -0700 |
Martin von Zweigbergk |
evolve: include "operation" metadata in obsmarkers
|
Mon, 12 Mar 2018 23:26:25 -0700 |
Martin von Zweigbergk |
tests: do not glob out fixed dates
|
Mon, 29 Jan 2018 00:09:44 +0530 |
Pulkit Goyal |
evolve: show the updated working directory after `hg evolve --continue`
|
Sat, 27 Jan 2018 21:15:27 +0530 |
Pulkit Goyal |
evolve: add evolve info to cmdutil.afterresolvedstates
|
Thu, 11 Jan 2018 20:03:20 +0530 |
Pulkit Goyal |
grab: add a command to grab a commit and update to it
|
Sat, 20 Jan 2018 11:59:36 +0100 |
Pierre-Yves David |
test: update with new 'update' hint about obsfate
|
Tue, 16 Jan 2018 04:35:34 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
Tue, 16 Jan 2018 04:32:43 +0100 |
Pierre-Yves David |
branching: merge stable back into default
|
Mon, 15 Jan 2018 19:52:00 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
Mon, 15 Jan 2018 19:42:44 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-02fdb8c018aa
stable
|
Sat, 06 Jan 2018 18:48:15 +0530 |
Pulkit Goyal |
evolve: don't use graftstate for continuing `hg evolve`
|
Fri, 05 Jan 2018 17:15:43 +0530 |
Pulkit Goyal |
evolve: use new trouble names in commit messages
|
Sat, 09 Dec 2017 08:19:07 +0530 |
Pulkit Goyal |
evolve: use compat.TROUBLES to show troubles in user interface
|
Fri, 05 Jan 2018 09:51:07 +0100 |
Boris Feld |
test: update output to 02fdb8c018aa
|
Fri, 05 Jan 2018 09:23:09 +0100 |
Boris Feld |
test: update output to 9b3f95d9783d
|
Wed, 01 Nov 2017 23:57:56 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
Thu, 26 Oct 2017 09:03:48 +0200 |
Pierre-Yves David |
evolve: rename --phasedivergent flag to --phase-divergent
|
Thu, 26 Oct 2017 09:02:25 +0200 |
Pierre-Yves David |
evolve: rename --contentdivergent flag to --content-divergent
|
Fri, 20 Oct 2017 18:44:52 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
Fri, 20 Oct 2017 20:04:13 +0200 |
Pierre-Yves David |
test-compat: revert output changes from phase renaming
mercurial-4.3
|
Fri, 20 Oct 2017 19:32:18 +0200 |
Pierre-Yves David |
test-compat: revert output changes related to temporary amend commit
mercurial-4.3
|
Wed, 27 Sep 2017 16:26:30 +0200 |
Pierre-Yves David |
packaging: merge stable back into default
|
Wed, 27 Sep 2017 01:22:58 +0200 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 3.9 compat branch
mercurial-3.9
|
Wed, 27 Sep 2017 00:54:28 +0200 |
Pierre-Yves David |
branching: merge future 6.7.0 in the stable branch
stable
|
Fri, 15 Sep 2017 15:48:18 +0200 |
Boris Feld |
tests: update after removing of redundant amend commit
|
Thu, 24 Aug 2017 10:57:32 -0700 |
Martin von Zweigbergk |
messages: use hyphenated '{phase,content}-divergent' in user messages
|
Thu, 24 Aug 2017 09:12:09 +0200 |
Boris Feld |
warning: rename warning message
|
Thu, 24 Aug 2017 09:11:54 +0200 |
Boris Feld |
warning: rename bumped warning message
|
Thu, 24 Aug 2017 09:11:06 +0200 |
Boris Feld |
warning: rename unstable warning message
|
Fri, 11 Aug 2017 11:30:34 +0200 |
Boris Feld |
revset: divergent() is deprecated
|
Fri, 11 Aug 2017 11:23:37 +0200 |
Boris Feld |
revset: unstable() is deprecated
|
Thu, 10 Aug 2017 19:31:55 +0200 |
Boris Feld |
log: bumped was renamed into phasedivergent
|
Thu, 10 Aug 2017 17:57:50 +0200 |
Boris Feld |
log: divergent was renamed into contentdivergent
|
Thu, 10 Aug 2017 17:37:31 +0200 |
Boris Feld |
log: unstable was renamed into orphan
|
Tue, 25 Jul 2017 04:01:10 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0
mercurial-3.9
|
Mon, 24 Jul 2017 04:41:31 +0200 |
Pierre-Yves David |
test: remove reference to the graphlog extension
|
Fri, 16 Jun 2017 11:54:01 +0200 |
Boris Feld |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
Thu, 15 Jun 2017 16:29:51 +0200 |
Pierre-Yves David |
test: drop now useless config about effect flag
|
Sun, 04 Jun 2017 20:47:04 +0200 |
Boris Feld |
effectflag: activate effect flag on test-stabilize-result.t test file
|
Wed, 03 May 2017 13:23:36 +0200 |
Pierre-Yves David |
merge with future 6.1.0
mercurial-3.9
|