| Sun, 22 Sep 2024 02:58:54 +0200 |
Pierre-Yves David |
obslog: also display patch for rebased changesets
|
| Mon, 06 Feb 2023 19:49:33 +0400 |
Anton Shestakov |
test-compat: merge mercurial-5.7 into mercurial-5.6
mercurial-5.6
|
| Fri, 07 Oct 2022 20:32:14 -0400 |
Matt Harbison |
evolve: stop preserving all of {extras} for uninterrupted evolve operations
|
| Fri, 07 Oct 2022 18:14:58 -0400 |
Matt Harbison |
evolve: don't embed graft data when completing interrupted evolve operations
|
| Tue, 22 Feb 2022 08:19:44 +0300 |
Anton Shestakov |
test-compat: merge mercurial-5.7 into mercurial-5.6
mercurial-5.6
|
| Mon, 22 Nov 2021 15:47:09 +0530 |
Sushil khanchi |
tests: remove unused mkcommit() definition
|
| Tue, 12 Oct 2021 14:04:23 +0300 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Tue, 12 Oct 2021 11:32:36 +0300 |
Anton Shestakov |
test-compat: merge mercurial-5.7 into mercurial-5.6
mercurial-5.6
|
| Thu, 12 Aug 2021 22:01:17 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Thu, 12 Aug 2021 22:01:14 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Thu, 12 Aug 2021 22:00:49 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-5.7 into mercurial-5.6
mercurial-5.6
|
| Thu, 17 Jun 2021 10:31:17 +0300 |
Anton Shestakov |
tests: remove bits of older setups that no longer are needed
|
| Thu, 17 Jun 2021 11:26:49 +0300 |
Anton Shestakov |
evolve: hg commit has --message flag
stable
|
| Sun, 31 Jan 2021 16:46:17 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Sun, 31 Jan 2021 16:15:26 +0800 |
Anton Shestakov |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Thu, 28 Jan 2021 18:57:48 +0800 |
Anton Shestakov |
tests: back out changeset 59b2be90e9fd
mercurial-5.6
|
| Thu, 28 Jan 2021 18:48:36 +0800 |
Anton Shestakov |
tests: back out changeset b3d9e6c805d6
mercurial-5.6
|
| Thu, 19 Nov 2020 08:28:45 -0800 |
Martin von Zweigbergk |
tests: update with more detailed exit codes
|
| Thu, 29 Oct 2020 09:19:37 -0700 |
Martin von Zweigbergk |
tests: rebase now produces different "one-line summary" output
|
| 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
|
| Mon, 16 Dec 2019 11:14:39 -0800 |
Martin von Zweigbergk |
tests: add debugobsolete calls before many obslog calls
|
| 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
|
| Fri, 27 Sep 2019 13:03:20 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.7 into mercurial-4.6
mercurial-4.6
|
| Fri, 27 Sep 2019 13:03:18 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 30 Aug 2019 11:31:19 +0700 |
Anton Shestakov |
obslog: only indent the first chunk and chunks just after newlines (issue6175)
stable
|
| Fri, 30 Aug 2019 11:28:02 +0700 |
Anton Shestakov |
tests: demonstrate too many spaces in olog -p output with word-diff
stable
|
| 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
|
| 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
|
| Fri, 19 Apr 2019 09:41:39 -0700 |
Martin von Zweigbergk |
evolve: run in a single transaction
|
| 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
|
| Tue, 23 Apr 2019 12:28:32 +0200 |
Pierre-Yves David |
test-compat: adapt test output to 4.4
mercurial-4.4
|
| 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
|
| Wed, 10 Apr 2019 21:03:56 +0200 |
Pierre-Yves David |
test: add file cancelation scenario for phase-divergence
|
| Wed, 10 Apr 2019 20:43:42 +0200 |
Pierre-Yves David |
test: introduce a more complete test for phase-divergence
|
| Wed, 10 Apr 2019 20:18:14 +0200 |
Pierre-Yves David |
test: cleanup title and doc phase-divergent cases
|
| Wed, 10 Apr 2019 16:40:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Tue, 09 Apr 2019 20:45:36 +0200 |
Pierre-Yves David |
extensions: avoid enabling evolve for unrelated repositories (issue6057)
stable
|
| Thu, 28 Mar 2019 15:05:57 -0700 |
Martin von Zweigbergk |
tests: add obslog output to some tests for divergence resolution
|
| Thu, 28 Mar 2019 14:54:46 -0700 |
Martin von Zweigbergk |
tests: add tests for divergence resolution with split+amend
|
| Tue, 26 Mar 2019 12:53:50 +0100 |
Pierre-Yves David |
test: use 'split' instead of 'splitted' in the tests
|
| Tue, 26 Mar 2019 12:30:10 +0100 |
Pierre-Yves David |
evolve: drop the "computing new diff message" for phase-divergence
|
| Wed, 20 Mar 2019 09:19:02 -0700 |
Martin von Zweigbergk |
evolve: clarify output when phase-divergence resolution results in no change
|
| Tue, 12 Mar 2019 09:44:05 -0700 |
Martin von Zweigbergk |
tests: reduce dependence on previous tests for setup
|
| Tue, 12 Mar 2019 09:48:05 -0700 |
Martin von Zweigbergk |
tests: create "private" repository in already-updated state
|
| 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
|
| Fri, 11 Jan 2019 09:26:41 -0800 |
Martin von Zweigbergk |
fold: sort concatenated commit messages in topological order
|
| 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
|
| 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 14:55:46 +0200 |
Pierre-Yves David |
test: backed out test output changes from changeset ef22eef37ecc
stable
|
| Wed, 12 Sep 2018 11:53:41 +0200 |
Pierre-Yves David |
test: update output to match new "pull" phase report
|
| 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:47:20 +0200 |
Pierre-Yves David |
test-compat: backed out changeset 41fc764bf28c
mercurial-4.6
|
| Tue, 31 Jul 2018 11:46:30 +0200 |
Pierre-Yves David |
test-compat: backed out changeset dda5b2134b32
mercurial-4.6
|
| 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
|
| Sun, 10 Jun 2018 20:58:55 +0530 |
Pulkit Goyal |
tests: update tests output with changes in d0abd7949ea3 in core hg
|
| Sun, 03 Jun 2018 01:59:41 +0530 |
Pulkit Goyal |
corecompat: update the tests output to show phase update summary
|
| 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 17:13:08 +0530 |
Pulkit Goyal |
tests: add test about handling phase-divergent merges
|
| Wed, 28 Mar 2018 12:56:35 +0530 |
Pulkit Goyal |
tests: add more tests for solving phase-divergence using `hg evolve`
|
| Sat, 24 Mar 2018 17:21:42 +0530 |
Pulkit Goyal |
evolve: handle interrupted phase-divergence resolution gracefully
|
| Sat, 24 Mar 2018 12:58:12 +0530 |
Pulkit Goyal |
evolve: move logic to complete interrupted orphan resolution to new fn
|
| Fri, 23 Mar 2018 19:36:08 +0530 |
Pulkit Goyal |
evolve: write data to evolvestate in case on conflicts in phase-divergence
|
| Fri, 23 Mar 2018 18:58:19 +0530 |
Pulkit Goyal |
tests: add tests of content+parent change creating phase-divergence
|
| Fri, 23 Mar 2018 18:28:37 +0530 |
Pulkit Goyal |
tests: show first line of commit message in test-evolve-phase-divergence.t
|
| Fri, 23 Mar 2018 17:49:26 +0530 |
Pulkit Goyal |
evolve: make sure bookmarks are moved after phase-divergence resolution
|
| 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
|
| Fri, 23 Mar 2018 15:27:26 +0530 |
Pulkit Goyal |
tests: add more tests for handling of phase divergence by `hg evolve`
|
| Fri, 23 Mar 2018 13:16:42 +0530 |
Pulkit Goyal |
tests: temporary delete the merge test of handling phase divergence
|
| Fri, 30 Mar 2018 19:38:55 +0200 |
Pulkit Goyal |
tests: various comment on test-evolve-phase-divergence
|
| Fri, 30 Mar 2018 19:37:06 +0200 |
Pulkit Goyal |
tests: make test-evolve-phase-divergence more descriptive
|
| Fri, 23 Mar 2018 12:44:06 +0530 |
Pulkit Goyal |
tests: rename test-evolve-bumped to test-evolve-phase-divergence.t
base
tests/test-evolve-bumped.t@6fe2255cccb2
|
