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
|
Fri, 28 Apr 2017 16:57:41 +0200 |
Boris Feld |
ui: add better messages when the working copy become obsolete.
|
Tue, 14 Mar 2017 14:47:20 -0700 |
Pierre-Yves David |
mercurial-3.9: merge with hg-4.0 branch
mercurial-3.9
|
Tue, 28 Feb 2017 15:09:03 +0100 |
Pierre-Yves David |
evolve: move the extensions to 'hgext3rd'
|
Sat, 29 Oct 2016 15:07:27 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.4
|
Sat, 29 Oct 2016 15:04:23 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.5
|
Sat, 29 Oct 2016 14:40:47 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.9
|
Fri, 28 Oct 2016 17:15:57 -0700 |
Martin von Zweigbergk |
evolve: use single quotes in usage messages
stable
|
Fri, 28 Oct 2016 17:11:43 -0700 |
Martin von Zweigbergk |
evolve: prefer "abort" over "abandon" in messages for consistency
stable
|
Fri, 28 Oct 2016 15:04:40 -0700 |
Martin von Zweigbergk |
evolve: suggest "hg update -C .", including '.', to abort evolve
stable
|
Fri, 28 Oct 2016 17:02:56 +0200 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.4
|
Fri, 28 Oct 2016 16:59:32 +0200 |
Pierre-Yves David |
merge future 5.5
mercurial-3.5
|
Fri, 28 Oct 2016 16:03:00 +0200 |
Pierre-Yves David |
integrate code update and test change from future 5.5 code
mercurial-3.9
|
Thu, 22 Sep 2016 09:15:30 -0700 |
Kostia Balytskyi |
evolve: fix test breaks related to double->single quote changes
|
Mon, 12 Sep 2016 10:41:00 -0700 |
Durham Goode |
bump: copy parent manifest before editting it
stable
|
Fri, 06 May 2016 00:08:31 +0200 |
Pierre-Yves David |
merge with stable through 3.5 branch
mercurial-3.4
|
Fri, 06 May 2016 00:00:14 +0200 |
Pierre-Yves David |
merge with stable throug 3.6 branch
mercurial-3.5
|
Fri, 18 Mar 2016 16:37:49 -0700 |
Pierre-Yves David |
prune: remove the kill alias
|
Thu, 11 Feb 2016 00:32:40 +0000 |
Pierre-Yves David |
merge with new stable through 3.5 and 3.6
mercurial-3.4
|
Thu, 04 Feb 2016 11:07:44 +0000 |
Pierre-Yves David |
tests: register expected difference for Mercurial 3.5
mercurial-3.5
|
Thu, 04 Feb 2016 11:01:35 +0000 |
Pierre-Yves David |
tests: register expected difference for Mercurial 3.4
mercurial-3.4
|
Fri, 30 Oct 2015 15:48:13 +0000 |
Pierre-Yves David |
tests: run test with 3.6 and apply test change
|
Thu, 25 Jun 2015 17:38:40 -0700 |
Pierre-Yves David |
merge with stable
|
Thu, 25 Jun 2015 16:55:27 -0700 |
Pierre-Yves David |
merge with stable
stable
|
Wed, 24 Jun 2015 16:37:02 -0700 |
Pierre-Yves David |
evolve: add a hint when the parent working copy become obsolete
|
Tue, 16 Jun 2015 15:14:37 -0700 |
Laurent Charignon |
evolve: add selector for trouble types
|
Fri, 19 Jun 2015 10:47:02 -0700 |
Pierre-Yves David |
merge with stable
|
Fri, 19 Jun 2015 10:44:25 -0700 |
Pierre-Yves David |
evolve: add a hint about how to abort an evolve with conflict
stable
|
Thu, 18 Jun 2015 23:45:37 -0700 |
Pierre-Yves David |
merge with stable
|