| Mon, 11 Nov 2019 02:42:37 +0700 |
Anton Shestakov |
docs: add two more amend commits to simulate temporary amend commits
stable
|
| Sun, 10 Nov 2019 05:14:53 +0700 |
Anton Shestakov |
tests: remove a repeated statement
stable
|
| Sat, 26 Oct 2019 13:30:21 +0700 |
Anton Shestakov |
tests: add shortlog of other repos to test-sharing.t
stable
|
| Sat, 26 Oct 2019 13:06:49 +0700 |
Anton Shestakov |
tests: use |shortest in test-sharing.t because sharing.rst uses it
stable
|
| 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:42:50 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Fri, 26 Apr 2019 01:20:08 +0530 |
Sushil khanchi |
evolve: move status msg to verbose mode in content-divergence resolution
|
| Sat, 27 Apr 2019 22:59:48 -0400 |
Matt Harbison |
revset: switch internal uses and tests to `predecessors` from legacy name
|
| 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:41:41 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.8 into mercurial-4.7
mercurial-4.7
|
| Wed, 10 Apr 2019 16:59:58 +0200 |
Pierre-Yves David |
branching: merge with stable
|
| Wed, 10 Apr 2019 16:59:28 +0200 |
Pierre-Yves David |
branching: merge with test consolidation
|
| Wed, 10 Apr 2019 15:37:29 +0200 |
Sushil khanchi |
evolve: make sure div resolution don't replace the initial author (issue6113)
stable
|
| Wed, 10 Apr 2019 14:32:00 +0200 |
Pierre-Yves David |
test: consolidate the content-divergent test cases
stable
|
| Fri, 05 Apr 2019 16:31:45 +0200 |
Pierre-Yves David |
tests: use current instability names everywhere
|
| Tue, 22 Jan 2019 12:57:25 -0500 |
Pierre-Yves David |
test-compat: merge mercurial-4.5 into mercurial-4.4
mercurial-4.4
|
| 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: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 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
|
| Wed, 13 Jun 2018 17:15:10 +0530 |
Pulkit Goyal |
evolve: create a new commit instead of amending one of the divergents
|
| Wed, 06 Jun 2018 03:26:47 +0530 |
Pulkit Goyal |
evolve: pop up editor if conflicts occur while merging commit messages
|
| 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
|
| Sun, 29 Apr 2018 19:18:54 +0530 |
Pulkit Goyal |
evolve: show cset hash in "merging conetnt-divergent changeset"
|
| 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
|
| Sat, 13 Jan 2018 14:35:49 -0800 |
Martin von Zweigbergk |
evolve: update output for wider reporting of troubled changesets
|
| Tue, 16 Jan 2018 04:32:43 +0100 |
Pierre-Yves David |
branching: merge stable back into default
|
| Tue, 16 Jan 2018 04:38:04 +0100 |
Pierre-Yves David |
test-compat: merge mercurial-4.3 into mercurial-4.2
mercurial-4.2
|
| Tue, 16 Jan 2018 04:35:34 +0100 |
Pierre-Yves David |
test-compat: merge stable into mercurial-4.3
mercurial-4.3
|
| 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 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.3 into mercurial-4.2
mercurial-4.2
|
| 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:02:25 +0200 |
Pierre-Yves David |
evolve: rename --contentdivergent flag to --content-divergent
|
| Fri, 20 Oct 2017 18:34:22 +0200 |
Pierre-Yves David |
test-compat: merge with mercurial-4.3 branch
mercurial-4.2
|
| 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
|
| Fri, 20 Oct 2017 15:30:42 +0200 |
Pierre-Yves David |
test-compat: revert output change on pull report
mercurial-4.3
|
| Tue, 17 Oct 2017 17:12:38 +0200 |
Pierre-Yves David |
test: adapt to output change from eb586ed5d8ce
|
| Wed, 27 Sep 2017 16:26:30 +0200 |
Pierre-Yves David |
packaging: merge stable back into default
|
| 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
|
| 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
|
| Fri, 11 Aug 2017 11:30:34 +0200 |
Boris Feld |
revset: divergent() is deprecated
|
| Thu, 10 Aug 2017 17:57:50 +0200 |
Boris Feld |
log: divergent was renamed into contentdivergent
|
| Tue, 25 Jul 2017 03:41:15 +0200 |
Pierre-Yves David |
test-compat: merge mercurial-4.2 with the new stable branch content
mercurial-4.2
|
| Sun, 23 Jul 2017 21:20:46 +0200 |
Pierre-Yves David |
amend: use precheck to validate revision
|
| Fri, 07 Jul 2017 00:42:18 +0200 |
Pierre-Yves David |
compat: adapt to change in 53b3a1968aa6-core
|
| Sun, 02 Jul 2017 19:43:44 +0200 |
Pierre-Yves David |
merge back with stable
|
| Sun, 02 Jul 2017 17:24:56 +0200 |
Pierre-Yves David |
merge: default into stable to prepare next version
stable
|
| Thu, 15 Jun 2017 14:44:45 +0200 |
Boris Feld |
test-update: update hg update output in test files
|
| Fri, 31 Mar 2017 15:44:10 +0200 |
Pierre-Yves David |
test-compat-hg-3.9: merge with future 6.0
mercurial-3.9
|
| 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'
|
| Fri, 28 Oct 2016 17:02:56 +0200 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.4
|
| Fri, 28 Oct 2016 16:26:25 +0200 |
Pierre-Yves David |
merge with future 5.5
mercurial-3.7
|
| 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
|
| Fri, 06 May 2016 00:08:31 +0200 |
Pierre-Yves David |
merge with stable through 3.5 branch
mercurial-3.4
|
| Thu, 05 May 2016 22:22:30 +0200 |
Pierre-Yves David |
mercurial-3.7: revert output change
mercurial-3.7
|
| Thu, 14 Apr 2016 13:02:23 -0700 |
Pierre-Yves David |
tests: adapt output to the new graphlog style
|
| Sun, 14 Feb 2016 14:37:40 +0000 |
Pierre-Yves David |
tests: add head warning messages
|
| 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:01:35 +0000 |
Pierre-Yves David |
tests: register expected difference for Mercurial 3.4
mercurial-3.4
|
| Wed, 03 Feb 2016 23:21:50 +0000 |
Pierre-Yves David |
test: back hash change from 'extra' content change out
|
| Fri, 04 Dec 2015 14:01:28 -0800 |
Laurent Charignon |
evolve: fix test-sharing.t to match new extra computation in core
|
| Mon, 03 Aug 2015 11:29:27 -0700 |
Pierre-Yves David |
merge with stable
|
| Sat, 01 Aug 2015 21:54:00 -0400 |
Matt Harbison |
test-sharing: fix globs for Windows
stable
|
| Thu, 25 Jun 2015 17:38:40 -0700 |
Pierre-Yves David |
merge with stable
|
| Thu, 25 Jun 2015 17:22:17 -0700 |
Pierre-Yves David |
tests: adapt the test for Mercurial 3.3
mercurial-3.3
|
| Thu, 25 Jun 2015 16:55:27 -0700 |
Pierre-Yves David |
merge with stable
stable
|
| Tue, 16 Jun 2015 15:14:37 -0700 |
Laurent Charignon |
evolve: add selector for trouble types
|
| Thu, 04 Jun 2015 13:26:58 -0700 |
Pierre-Yves David |
test: adapt to change in mercurial core
|
| Tue, 14 Apr 2015 12:58:13 -0400 |
Greg Ward |
docs: revive the explanation of divergent changesets in the sharing guide
stable
|
| Tue, 14 Apr 2015 12:55:04 -0400 |
Greg Ward |
docs: sharing guide: clarify end-game of "Example 2"
stable
|
| Tue, 14 Apr 2015 12:53:12 -0400 |
Greg Ward |
docs: add code review scenario to sharing guide
stable
|
| Tue, 14 Apr 2015 12:43:37 -0400 |
Greg Ward |
docs: update sharing guide based (mostly) on marmoute's review
stable
|
| Thu, 16 Oct 2014 14:06:52 -0700 |
Pierre-Yves David |
test: ignore bytes lenght in message
|
| Thu, 04 Sep 2014 09:06:18 +0200 |
Pierre-Yves David |
merge with stable
|
| Tue, 12 Aug 2014 21:02:34 -0400 |
Matt Harbison |
test: add glob annotations where Mercurial's run-tests.py suggests
stable
|
| Tue, 02 Sep 2014 20:11:45 +0200 |
Pierre-Yves David |
merge: all the stable sweetness into default
|
| Fri, 29 Aug 2014 14:26:17 +0200 |
David Soria Parra |
evolve: write a status message when the working directory changes
stable
|
| Wed, 27 Aug 2014 18:28:22 +0200 |
Pierre-Yves David |
compat: update the tests after the jump
|
| Fri, 08 Aug 2014 17:34:22 -0700 |
Pierre-Yves David |
evolve: add "absolescence" in front of markers in the message
|
| Fri, 08 Aug 2014 17:29:29 -0700 |
Pierre-Yves David |
evolve: re-introduce the "pushing 42 markers…" message
|
| Fri, 08 Aug 2014 17:16:29 -0700 |
Pierre-Yves David |
evolve: hide the OBSEXC message behind a config option
|
| Sun, 22 Jun 2014 20:10:07 -0400 |
Greg Ward |
evolve: add --tool option so we don't have to use HGMERGE
|
| Fri, 06 Jun 2014 17:19:17 -0400 |
Greg Ward |
docs: add guide to sharing mutable history
|
