| Sat, 31 Oct 2020 18:55:21 +0800 |
Anton Shestakov |
tests: adjust test output after b2de5825e5ca for older Mercurial
mercurial-5.3
|
| Sat, 31 Oct 2020 18:37:12 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Fri, 25 Sep 2020 11:06:46 -0700 |
Martin von Zweigbergk |
evolve: don't set evolved node as dirstate p2
|
| Thu, 17 Sep 2020 20:26:55 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Thu, 17 Sep 2020 14:51:45 +0530 |
Pulkit Goyal |
evolvecmd: don't set `branchmerge=True` while resolving phase divergence
stable
|
| Wed, 22 Jul 2020 23:40:24 +0530 |
Sushil khanchi |
evolve: improve warning msg when skipping orphan resolution
|
| Fri, 31 Jul 2020 19:19:13 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Fri, 31 Jul 2020 19:14:30 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 31 Jul 2020 18:16:04 +0800 |
Anton Shestakov |
test-compat: merge mercurial-5.4 into mercurial-5.3
mercurial-5.3
|
| Sat, 27 Jun 2020 22:46:08 +0800 |
Aay Jay Chan |
evolve: fix a typo in help text
stable
|
| Fri, 08 May 2020 22:50:09 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Fri, 08 May 2020 22:18:15 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 08 May 2020 19:22:36 +0800 |
Anton Shestakov |
test-compat: back out changeset 4da1d21231ae
mercurial-5.3
|
| Thu, 07 May 2020 01:29:48 +0200 |
Anton Shestakov |
obslog: makes --origin flag the default
|
| Wed, 15 Apr 2020 21:52:29 +0800 |
Anton Shestakov |
tests: update output to match 1b8fd4af3318 in core
|
| Sat, 29 Feb 2020 15:18:00 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sat, 29 Feb 2020 15:17:31 +0700 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Tue, 14 Jan 2020 20:20:13 +0700 |
Anton Shestakov |
obslog: use _successorsetverb() in regular obslog too
|
| Sat, 11 Jan 2020 19:52:56 +0700 |
Anton Shestakov |
fold: actually track folds using fold-* metadata in obsmarkers
|
| Mon, 29 Jul 2019 14:43:17 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Mon, 29 Jul 2019 14:43:15 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Mon, 29 Jul 2019 13:54:57 +0200 |
Pierre-Yves David |
branching: merge stable into default
|
| Mon, 29 Jul 2019 11:40:22 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Mon, 29 Jul 2019 11:40:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 19 Jul 2019 17:25:29 +0800 |
Anton Shestakov |
prune: spell --successor flag without any unnecessary shortcuts
stable
|
| 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
|
| Sat, 08 Jun 2019 15:59:31 +0530 |
Sushil khanchi |
evolve: move a code block to have right value in has_some_val
|
| 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: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
|
| Sat, 27 Apr 2019 22:45:16 -0400 |
Matt Harbison |
templatekw: add `instabilities` alias for `troubles`
|
| Thu, 25 Apr 2019 15:14:21 -0700 |
Martin von Zweigbergk |
messages: standardize on "working copy is now at" including "is"
|
| Sun, 21 Apr 2019 13:04:40 +0530 |
Sushil khanchi |
test: move a test to an appropriate test file
|
| Sun, 21 Apr 2019 12:07:26 +0530 |
Sushil khanchi |
test: improve the title of a test
|
| Sun, 21 Apr 2019 12:06:31 +0530 |
Sushil khanchi |
test: remove duplicated test
|
| Wed, 24 Apr 2019 17:21:21 +0800 |
Anton Shestakov |
evolve: use --all by default (BC)
|
| Wed, 24 Apr 2019 17:02:27 +0800 |
Anton Shestakov |
tests: add --rev to hg evolve to reduce test changes for the next patch
|
| Wed, 24 Apr 2019 15:59:02 +0200 |
Anton Shestakov |
evolve: don't update after instability resolution by default (BC)
|
| Sun, 14 Apr 2019 02:18:19 +0800 |
Anton Shestakov |
tests: add --update to hg evolve to reduce test changes for the next patch
|
| Thu, 11 Apr 2019 22:44:53 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Thu, 11 Apr 2019 22:42:13 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Thu, 11 Apr 2019 22:41:41 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 05 Apr 2019 16:31:45 +0200 |
Pierre-Yves David |
tests: use current instability names everywhere
|
| Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
| Mon, 25 Mar 2019 15:44:44 -0700 |
Martin von Zweigbergk |
prune: use action "prune", not "touch", in precheck
stable
|
| Tue, 22 Jan 2019 12:57:25 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Tue, 22 Jan 2019 12:54:44 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Tue, 22 Jan 2019 12:54:43 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Tue, 25 Dec 2018 14:35:54 +0530 |
Sushil khanchi |
evolve: cover the orphanmerge part missed by lastsolved
|
| Thu, 17 Jan 2019 16:20:35 +0530 |
Sushil khanchi |
evolve: add test which shows orphan-merge resolution can result to crash
|
| Thu, 25 Oct 2018 17:03:34 +0200 |
Pierre-Yves David |
branching: merge stable back into default
|
| Thu, 25 Oct 2018 16:33:10 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Thu, 25 Oct 2018 13:05:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Thu, 25 Oct 2018 13:03:30 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Thu, 25 Oct 2018 13:24:34 +0200 |
Pierre-Yves David |
branching: revert test outptu change for 4.7
mercurial-4.7
|
| Thu, 25 Oct 2018 12:55:12 +0200 |
Pierre-Yves David |
test-compat: backed out changeset e2d083cc447e
stable
|
| Thu, 25 Oct 2018 12:53:48 +0200 |
Pierre-Yves David |
test-compat: backed out changeset ccbfbeee6cf3
stable
|
| Thu, 25 Oct 2018 12:53:09 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 7091f7215651
stable
|
| Thu, 25 Oct 2018 12:52:34 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 8eec9422bd8e
stable
|
| Wed, 17 Oct 2018 13:44:06 +0200 |
Pierre-Yves David |
branching: preserve the expected output on default
|
| Fri, 12 Oct 2018 15:20:54 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Fri, 12 Oct 2018 15:15:09 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Fri, 12 Oct 2018 15:15:05 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
| Fri, 12 Oct 2018 15:07:23 +0200 |
Pierre-Yves David |
test: other harmless output change
stable
|
| Fri, 12 Oct 2018 14:56:00 +0200 |
Pierre-Yves David |
test: backed out output changes from changeset 6f391c2a773b
stable
|
| Fri, 12 Oct 2018 14:55:46 +0200 |
Pierre-Yves David |
test: backed out test output changes from changeset ef22eef37ecc
stable
|
| Fri, 12 Oct 2018 14:55:37 +0200 |
Pierre-Yves David |
test: backed out output changes from changeset 0171a7ceb574
stable
|
| Fri, 21 Sep 2018 15:52:53 +0530 |
Sushil khanchi |
evovle: remove redundancy in evolve output
|
| Wed, 12 Sep 2018 12:02:17 +0200 |
Pierre-Yves David |
test: update output to match new `hg verify` reports
|
| Wed, 12 Sep 2018 11:53:41 +0200 |
Pierre-Yves David |
test: update output to match new "pull" phase report
|
| Wed, 12 Sep 2018 10:37:14 +0200 |
Pierre-Yves David |
test: adapt to change in revert messages order
|
| Mon, 03 Sep 2018 22:09:26 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Mon, 03 Sep 2018 22:06:12 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Mon, 03 Sep 2018 21:59:24 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
| Mon, 03 Sep 2018 23:21:39 +0200 |
Pierre-Yves David |
branching: merge back with stable
|
| Mon, 03 Sep 2018 17:21:16 +0200 |
Pierre-Yves David |
test-output: backout test output update in 8fcee1e65e29
stable
|
| Fri, 31 Aug 2018 09:21:19 +0200 |
Pierre-Yves David |
pick: replace `hg grab` invocation in test with `hg pick`
|
| Fri, 31 Aug 2018 09:20:21 +0200 |
Pierre-Yves David |
pick: replace "grabstate" with "pickstate"
|
| Fri, 31 Aug 2018 09:19:13 +0200 |
Pierre-Yves David |
pick: use "pick" as operation name in obsolescence markers
|
| Fri, 31 Aug 2018 09:13:11 +0200 |
Pierre-Yves David |
pick: update command output to mention pick instead of grab
|
| Tue, 21 Aug 2018 14:09:33 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Tue, 21 Aug 2018 13:26:35 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Tue, 21 Aug 2018 13:25:28 +0200 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.6
mercurial-4.6
|
| Tue, 21 Aug 2018 04:08:38 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Sat, 18 Aug 2018 21:03:45 +0530 |
Pulkit Goyal |
evolve: set the second parent if we get conflicts while evolving
stable
|
| Tue, 14 Aug 2018 19:22:54 +0200 |
Pierre-Yves David |
test: adapt to core output change on unknown command
|
| Fri, 03 Aug 2018 00:22:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.4 into mercurial-4.3
mercurial-4.3
|
| Thu, 02 Aug 2018 02:47:44 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| Tue, 31 Jul 2018 11:45:01 +0200 |
Pierre-Yves David |
test-compat: backout change to 1e103c7f7663
mercurial-4.6
|
| Tue, 19 Jun 2018 23:21:54 +0530 |
Pulkit Goyal |
evolve: move the bookmarks also when updating to successor (issue5923)
|
| Tue, 19 Jun 2018 23:21:44 +0530 |
Pulkit Goyal |
tests: add test to demonstrate issue5923
|
| Fri, 15 Jun 2018 00:16:29 +0530 |
Pulkit Goyal |
evolve: raise error.InterventionRequired instead of Abort when conflicts
|
| Tue, 12 Jun 2018 19:00:12 +0530 |
Pulkit Goyal |
evolve: improve error messages when conflicts occur
|
| Mon, 11 Jun 2018 01:12:12 +0530 |
Pulkit Goyal |
evolve: rename help topic evolve.interrupted-evolve to evolve.interrupted
|
| Wed, 06 Jun 2018 04:09:49 +0530 |
Pulkit Goyal |
evolve: show `hg help evolve.interrupted-evolve` in error when conflicts
|
| Mon, 21 May 2018 14:56:51 +0200 |
Boris Feld |
test: update to new outputs
|
| 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
|
| Thu, 15 Mar 2018 00:09:24 +0530 |
Pulkit Goyal |
evolve: kill `--obsolete` and `--old-obsolete` flags for graft
|
| Wed, 21 Mar 2018 16:35:18 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
| 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:51:34 -0700 |
Martin von Zweigbergk |
touch: include "operation" metadata in obsmarkers
|
| Mon, 12 Mar 2018 15:50:59 -0700 |
Martin von Zweigbergk |
fold: include "operation" metadata in obsmarkers
|
| Mon, 12 Mar 2018 15:50:25 -0700 |
Martin von Zweigbergk |
amend: include "operation" metadata in obsmarkers
|
| Mon, 12 Mar 2018 23:26:25 -0700 |
Martin von Zweigbergk |
tests: do not glob out fixed dates
|
| Wed, 24 Jan 2018 09:55:12 -0800 |
Martin von Zweigbergk |
update: show "use 'hg evolve' to..." hint iff evolve command enabled
stable
|
| Tue, 16 Jan 2018 04:41:48 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
| 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 20:45:13 +0100 |
Pierre-Yves David |
tests: update test output to match 4.4
stable
|
| Mon, 15 Jan 2018 19:52:00 +0100 |
Pierre-Yves David |
branching: backed out test output changes from core-1905aac253f0
stable
|
| Fri, 05 Jan 2018 17:15:43 +0530 |
Pulkit Goyal |
evolve: use new trouble names in commit messages
|
| Fri, 05 Jan 2018 09:23:09 +0100 |
Boris Feld |
test: update output to 9b3f95d9783d
|
| Wed, 01 Nov 2017 23:58:27 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 into mercurial-4.1
mercurial-4.1
|
