| Tue, 21 Aug 2018 04:08:38 +0200 |
Pierre-Yves David |
branching: merge with stable
|
file |
diff |
annotate
|
| Sat, 18 Aug 2018 21:03:45 +0530 |
Pulkit Goyal |
evolve: set the second parent if we get conflicts while evolving
stable
|
file |
diff |
annotate
|
| Tue, 14 Aug 2018 19:22:54 +0200 |
Pierre-Yves David |
test: adapt to core output change on unknown command
|
file |
diff |
annotate
|
| Fri, 03 Aug 2018 00:22:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Thu, 02 Aug 2018 02:47:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Tue, 31 Jul 2018 11:45:01 +0200 |
Pierre-Yves David |
test-compat: backout change to 1e103c7f7663
mercurial-4.6
|
file |
diff |
annotate
|
| Tue, 19 Jun 2018 23:21:54 +0530 |
Pulkit Goyal |
evolve: move the bookmarks also when updating to successor (issue5923)
|
file |
diff |
annotate
|
| Tue, 19 Jun 2018 23:21:44 +0530 |
Pulkit Goyal |
tests: add test to demonstrate issue5923
|
file |
diff |
annotate
|
| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
file |
diff |
annotate
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
file |
diff |
annotate
|
| Mon, 11 Jun 2018 01:12:12 +0530 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
file |
diff |
annotate
|
| Wed, 06 Jun 2018 04:09:49 +0530 |
Pulkit Goyal |
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
|
file |
diff |
annotate
|
| Mon, 21 May 2018 14:56:51 +0200 |
Boris Feld |
test: update to new outputs
|
file |
diff |
annotate
|
| Wed, 25 Apr 2018 01:58:45 +0100 |
Pierre-Yves David |
testcompat: update output for Mercurial 4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 23 Apr 2018 12:23:00 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Mon, 23 Apr 2018 12:11:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Sun, 22 Apr 2018 11:40:17 +0200 |
Pierre-Yves David |
evolve: point to '--abort' in error message
|
file |
diff |
annotate
|
| Thu, 15 Mar 2018 00:09:24 +0530 |
Pulkit Goyal |
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:35:18 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:32:54 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:18:31 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 16:06:17 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.4
mercurial-4.4
|
file |
diff |
annotate
|
| Mon, 12 Mar 2018 15:51:34 -0700 |
Martin von Zweigbergk |
touch: include "operation" metadata in obsmarkers
|
file |
diff |
annotate
|
| Mon, 12 Mar 2018 15:50:59 -0700 |
Martin von Zweigbergk |
fold: include "operation" metadata in obsmarkers
|
file |
diff |
annotate
|
| Mon, 12 Mar 2018 15:50:25 -0700 |
Martin von Zweigbergk |
amend: include "operation" metadata in obsmarkers
|
file |
diff |
annotate
|
| Mon, 12 Mar 2018 23:26:25 -0700 |
Martin von Zweigbergk |
tests: do not glob out fixed dates
|
file |
diff |
annotate
|
| Wed, 24 Jan 2018 09:55:12 -0800 |
Martin von Zweigbergk |
update: show "use 'hg evolve' to..." hint iff evolve command enabled
stable
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:41:48 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:35:34 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Tue, 16 Jan 2018 04:32:43 +0100 |
Pierre-Yves David |
branching: merge stable back into default
|
file |
diff |
annotate
|
| Mon, 15 Jan 2018 20:45:13 +0100 |
Pierre-Yves David |
tests: update test output to match 4.4
stable
|
file |
diff |
annotate
|
| Mon, 15 Jan 2018 19:52:00 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
file |
diff |
annotate
|
| Fri, 05 Jan 2018 17:15:43 +0530 |
Pulkit Goyal |
evolve: use new trouble names in commit messages
|
file |
diff |
annotate
|
| Fri, 05 Jan 2018 09:23:09 +0100 |
Boris Feld |
test: update output to 9b3f95d9783d
|
file |
diff |
annotate
|
| Wed, 01 Nov 2017 23:58:27 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
file |
diff |
annotate
|
| Wed, 01 Nov 2017 23:57:56 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
file |
diff |
annotate
|
| Thu, 26 Oct 2017 09:03:48 +0200 |
Pierre-Yves David |
evolve: rename --phasedivergent flag to --phase-divergent
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 18:44:52 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 18:41:05 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.2 branch
mercurial-4.1
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 20:04:13 +0200 |
Pierre-Yves David |
test-compat: revert output changes from phase renaming
mercurial-4.3
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 19:32:18 +0200 |
Pierre-Yves David |
test-compat: revert output changes related to temporary amend commit
mercurial-4.3
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 16:07:06 +0200 |
Pierre-Yves David |
test-compat: revert ouput related to operation
mercurial-4.3
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 15:30:42 +0200 |
Pierre-Yves David |
test-compat: revert output change on pull report
mercurial-4.3
|
file |
diff |
annotate
|
| Tue, 17 Oct 2017 17:12:38 +0200 |
Pierre-Yves David |
test: adapt to output change from eb586ed5d8ce
|
file |
diff |
annotate
|
| Mon, 25 Sep 2017 02:23:36 +0530 |
Pulkit Goyal |
tests: update test output with commit ecc96506c49d in core
|
file |
diff |
annotate
|
| Wed, 27 Sep 2017 16:26:30 +0200 |
Pierre-Yves David |
packaging: merge stable back into default
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Wed, 27 Sep 2017 01:12:47 +0200 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 4.1 compat branch
mercurial-4.1
|
file |
diff |
annotate
|
| Wed, 27 Sep 2017 01:07:22 +0200 |
Pierre-Yves David |
compat-test: merge future 6.7.0 into 4.2 compat branch
mercurial-4.2
|
file |
diff |
annotate
|
| Wed, 27 Sep 2017 00:54:28 +0200 |
Pierre-Yves David |
branching: merge future 6.7.0 in the stable branch
stable
|
file |
diff |
annotate
|
| Fri, 15 Sep 2017 15:48:18 +0200 |
Boris Feld |
tests: update after removing of redundant amend commit
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 10:57:32 -0700 |
Martin von Zweigbergk |
messages: use hyphenated '{phase,content}-divergent' in user messages
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 09:11:54 +0200 |
Boris Feld |
warning: rename bumped warning message
|
file |
diff |
annotate
|
| Thu, 24 Aug 2017 09:11:06 +0200 |
Boris Feld |
warning: rename unstable warning message
|
file |
diff |
annotate
|
| Fri, 11 Aug 2017 11:43:57 +0200 |
Boris Feld |
revset: bumped() is deprecated
|
file |
diff |
annotate
|
| Thu, 10 Aug 2017 19:31:55 +0200 |
Boris Feld |
log: bumped was renamed into phasedivergent
|
file |
diff |
annotate
|
| Thu, 10 Aug 2017 17:37:31 +0200 |
Boris Feld |
log: unstable was renamed into orphan
|
file |
diff |
annotate
|
| Wed, 09 Aug 2017 16:01:20 +0200 |
Boris Feld |
output: update obsfate / obslog output order
|
file |
diff |
annotate
|
| Tue, 25 Jul 2017 04:01:10 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0
mercurial-3.9
|
file |
diff |
annotate
|
| Tue, 25 Jul 2017 03:59:22 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.2
mercurial-4.1
|
file |
diff |
annotate
|
| Sun, 23 Jul 2017 21:21:11 +0200 |
Pierre-Yves David |
prune: use precheck to validate revision
|
file |
diff |
annotate
|
| Mon, 24 Jul 2017 01:45:17 +0200 |
Pierre-Yves David |
uncommit: use precheck to validate revision
|
file |
diff |
annotate
|
| Sun, 23 Jul 2017 19:52:06 +0200 |
Pierre-Yves David |
evolve: document the various instability/troubles
|
file |
diff |
annotate
|
| Mon, 24 Jul 2017 04:41:31 +0200 |
Pierre-Yves David |
test: remove reference to the graphlog extension
|
file |
diff |
annotate
|
| Sun, 23 Jul 2017 16:39:21 +0200 |
Pierre-Yves David |
test: extract most fold testing into a test-fold module
|
file |
diff |
annotate
|
| Fri, 16 Jun 2017 11:54:01 +0200 |
Boris Feld |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
file |
diff |
annotate
|
| Fri, 16 Jun 2017 11:42:00 +0200 |
Pierre-Yves David |
compat-test: merge with stable
mercurial-4.1
|
file |
diff |
annotate
|
| Thu, 15 Jun 2017 16:29:51 +0200 |
Pierre-Yves David |
test: drop now useless config about effect flag
|
file |
diff |
annotate
|
| Fri, 02 Jun 2017 19:53:42 +0200 |
Boris Feld |
effectflag: activate effect flag on test-evolve.t test file
|
file |
diff |
annotate
|
| Thu, 15 Jun 2017 13:10:43 +0200 |
Pierre-Yves David |
test-evolve: garbage collection changeset only, not obsmarkers
|
file |
diff |
annotate
|
| Mon, 05 Jun 2017 10:15:00 +0100 |
Pierre-Yves David |
debugobsstorestat: adds static about actually obsolete changeses
stable
|
file |
diff |
annotate
|
| Wed, 31 May 2017 14:28:14 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.0 branch
mercurial-3.9
|
file |
diff |
annotate
|
| Wed, 31 May 2017 14:21:18 +0200 |
Pierre-Yves David |
test-compat: merge with stable
mercurial-4.1
|
file |
diff |
annotate
|
| Mon, 29 May 2017 17:54:14 +0200 |
Boris Feld |
test: extract metaedit tests into test-metaedit.t test file
|
file |
diff |
annotate
|
| Fri, 26 May 2017 16:12:07 +0200 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| Fri, 26 May 2017 15:01:21 +0200 |
Boris Feld |
test: fix test-evolve.t
stable
|
file |
diff |
annotate
|
| Fri, 19 May 2017 11:16:22 +0200 |
Pierre-Yves David |
debugobsstorestat: add markers size information
|
file |
diff |
annotate
|
| Thu, 18 May 2017 23:51:10 +0200 |
Pierre-Yves David |
merge with future 6.2.0
mercurial-3.9
|
file |
diff |
annotate
|
| Thu, 18 May 2017 23:12:52 +0200 |
Pierre-Yves David |
merge with future 6.2.0
mercurial-4.1
|
file |
diff |
annotate
|
| Thu, 18 May 2017 23:24:57 +0200 |
Pierre-Yves David |
test: reduce output size to fight unstability
stable
|
file |
diff |
annotate
|
| Thu, 18 May 2017 18:18:01 +0200 |
Pierre-Yves David |
obshistory: rename the command to "olog"
|
file |
diff |
annotate
|
| Wed, 03 May 2017 13:23:36 +0200 |
Pierre-Yves David |
merge with future 6.1.0
mercurial-3.9
|
file |
diff |
annotate
|
| Wed, 03 May 2017 13:12:39 +0200 |
Pierre-Yves David |
merge with future 6.1.0
mercurial-4.1
|
file |
diff |
annotate
|
| Fri, 28 Apr 2017 16:56:09 +0200 |
Boris Feld |
ui: change the hidden revision error message
|
file |
diff |
annotate
|
| Fri, 31 Mar 2017 15:44:10 +0200 |
Pierre-Yves David |
test-compat-hg-3.9: merge with future 6.0
mercurial-3.9
|
file |
diff |
annotate
|
| Fri, 24 Mar 2017 09:49:03 +0100 |
Pierre-Yves David |
debugobshashrange: add a --subranges option
|
file |
diff |
annotate
|
| Fri, 24 Mar 2017 09:42:39 +0100 |
Pierre-Yves David |
debug: rename 'debugstablerange' to 'debugobshashrange'
|
file |
diff |
annotate
|
| Fri, 24 Mar 2017 09:40:50 +0100 |
Pierre-Yves David |
debugstablerange: improve output spacing
|
file |
diff |
annotate
|
| Tue, 14 Mar 2017 14:47:20 -0700 |
Pierre-Yves David |
mercurial-3.9: merge with hg-4.0 branch
mercurial-3.9
|
file |
diff |
annotate
|
| Fri, 10 Mar 2017 10:36:46 -0800 |
Pierre-Yves David |
discovery: introduce a official 'obshash associated to a range
|
file |
diff |
annotate
|
| Tue, 28 Feb 2017 15:09:03 +0100 |
Pierre-Yves David |
evolve: move the extensions to 'hgext3rd'
|
file |
diff |
annotate
|
| Wed, 01 Feb 2017 16:03:39 +0100 |
Pierre-Yves David |
merge with 5.6.0
mercurial-3.4
|
file |
diff |
annotate
|
| Wed, 01 Feb 2017 15:51:02 +0100 |
Pierre-Yves David |
merge with 5.6.0
mercurial-3.5
|
file |
diff |
annotate
|
| Wed, 01 Feb 2017 15:45:20 +0100 |
Pierre-Yves David |
merge with 5.6.0
mercurial-3.6
|
file |
diff |
annotate
|
| Wed, 01 Feb 2017 15:40:51 +0100 |
Pierre-Yves David |
merge with 5.6.0
mercurial-3.7
|
file |
diff |
annotate
|
| Wed, 01 Feb 2017 15:27:04 +0100 |
Pierre-Yves David |
merge with 5.6.0
mercurial-3.9
|
file |
diff |
annotate
|
| Wed, 25 Jan 2017 16:50:19 +0100 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| Wed, 25 Jan 2017 16:40:45 +0100 |
Pierre-Yves David |
fold: cleanly abort on empty fold set (issue5453)
stable
|
file |
diff |
annotate
|
| Thu, 12 Jan 2017 13:47:49 -0800 |
Martin von Zweigbergk |
fold: require --from flag for folding revisions to working copy
|
file |
diff |
annotate
|
| Wed, 23 Nov 2016 21:00:42 +0530 |
Pulkit Goyal |
prune: improve error message if unstable changes are disallowed
|
file |
diff |
annotate
|
| Sat, 29 Oct 2016 15:07:27 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.4
|
file |
diff |
annotate
|
| Sat, 29 Oct 2016 15:04:23 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.5
|
file |
diff |
annotate
|
| Sat, 29 Oct 2016 15:01:41 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.6
|
file |
diff |
annotate
|
| Sat, 29 Oct 2016 14:55:57 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.7
|
file |
diff |
annotate
|
| Sat, 29 Oct 2016 14:40:47 +0200 |
Pierre-Yves David |
merge with latest fix
mercurial-3.9
|
file |
diff |
annotate
|
| Fri, 28 Oct 2016 17:15:57 -0700 |
Martin von Zweigbergk |
evolve: use single quotes in usage messages
stable
|
file |
diff |
annotate
|
| Fri, 28 Oct 2016 15:04:40 -0700 |
Martin von Zweigbergk |
evolve: suggest "hg update -C .", including '.', to abort evolve
stable
|
file |
diff |
annotate
|
| Fri, 28 Oct 2016 17:02:56 +0200 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.4
|
file |
diff |
annotate
|
| Fri, 28 Oct 2016 16:59:32 +0200 |
Pierre-Yves David |
merge future 5.5
mercurial-3.5
|
file |
diff |
annotate
|
| Fri, 28 Oct 2016 16:34:57 +0200 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.6
|
file |
diff |
annotate
|
| Fri, 28 Oct 2016 16:26:25 +0200 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.7
|
file |
diff |
annotate
|
| 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
|
file |
diff |
annotate
|
| Thu, 22 Sep 2016 09:15:30 -0700 |
Kostia Balytskyi |
evolve: fix test breaks related to double->single quote changes
|
file |
diff |
annotate
|
| Tue, 13 Sep 2016 01:25:17 +0200 |
Pierre-Yves David |
merge with stable
|
file |
diff |
annotate
|
| Tue, 13 Sep 2016 00:56:57 +0200 |
Pierre-Yves David |
backed out changeset 7a76f9a43e89
|
file |
diff |
annotate
|
| Mon, 12 Sep 2016 10:41:00 -0700 |
Durham Goode |
bump: copy parent manifest before editting it
stable
|
file |
diff |
annotate
|
| Fri, 09 Sep 2016 16:42:41 -0700 |
Martin von Zweigbergk |
templates: change {obsolete} to emit only "obsolete" or ""
|
file |
diff |
annotate
|
| Wed, 07 Sep 2016 17:51:15 +0200 |
Pierre-Yves David |
debug data for manifest change in core
|
file |
diff |
annotate
|
| Wed, 25 May 2016 19:41:08 +0000 |
timeless |
help: fix evolution help grammar
stable
|
file |
diff |
annotate
|
| Wed, 25 May 2016 19:13:26 +0000 |
timeless |
help: fix evolution hg phases reference
stable
|
file |
diff |
annotate
|