| Fri, 29 Jan 2021 12:16:55 -0800 |
Martin von Zweigbergk |
errors: use exit code 40 for when a hook fails
|
file |
diff |
annotate
|
| Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
file |
diff |
annotate
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
file |
diff |
annotate
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
file |
diff |
annotate
|
| Wed, 01 Apr 2020 14:34:21 -0700 |
Martin von Zweigbergk |
rebase: don't create merge when continuing rebase interrupted by old hg
|
file |
diff |
annotate
|
| Wed, 01 Apr 2020 13:27:28 -0700 |
Martin von Zweigbergk |
tests: demonstrate how continuing rebase after upgrade can result in merge
|
file |
diff |
annotate
|
| Fri, 10 Jan 2020 14:22:20 -0800 |
Martin von Zweigbergk |
rebase: don't use rebased node as dirstate p2 (BC)
|
file |
diff |
annotate
|
| Fri, 07 Dec 2018 14:23:17 -0800 |
Martin von Zweigbergk |
rebase: clarify that commits that become empty are skipped
|
file |
diff |
annotate
|
| Fri, 07 Dec 2018 14:17:09 -0800 |
Martin von Zweigbergk |
rebase: format commit in usual way when explaining that it became empty
|
file |
diff |
annotate
|
| Sun, 15 Jul 2018 23:46:09 -0400 |
Matt Harbison |
hook: disable the shell to native command translation by default
|
file |
diff |
annotate
|
| Sun, 02 Jul 2017 00:32:09 -0400 |
Matt Harbison |
hooks: allow Unix style environment variables on external Windows hooks
|
file |
diff |
annotate
|
| Thu, 08 Mar 2018 14:17:24 -0800 |
Martin von Zweigbergk |
rebase: fix issue 5494 also with --collapse
|
file |
diff |
annotate
|
| Wed, 07 Mar 2018 11:00:17 -0800 |
Martin von Zweigbergk |
tests: add test for issue 5494 but with --collapse
|
file |
diff |
annotate
|
| Wed, 07 Mar 2018 10:55:57 -0800 |
Martin von Zweigbergk |
tests: .hg/merge is a directory, so use `test -d`
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
file |
diff |
annotate
|
| Sun, 10 Dec 2017 21:57:37 -0800 |
Phil Cohen |
tests: add commit hashes to log commands in rebase tests
|
file |
diff |
annotate
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
file |
diff |
annotate
|
| Sat, 01 Jul 2017 15:13:09 -0400 |
Matt Harbison |
test-rebase-interruptions: stabilize for Windows
|
file |
diff |
annotate
|
| Thu, 29 Jun 2017 15:21:52 -0700 |
Martin von Zweigbergk |
merge with stable
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 18:13:10 +0200 |
Pierre-Yves David |
rebase: also test abort from pretxnclose error
stable
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 18:10:55 +0200 |
Pierre-Yves David |
rebase: reinforce testing around precommit hook interrupting a rebase
stable
|
file |
diff |
annotate
|
| Tue, 27 Jun 2017 17:45:58 +0200 |
Pierre-Yves David |
rebase: provides test case for (issue5610)
stable
|
file |
diff |
annotate
|
| Thu, 18 May 2017 13:18:05 -0700 |
Jeremy Fitzhardinge |
rebase: make sure merge state is cleaned up for no-op rebases (issue5494)
|
file |
diff |
annotate
|
| Thu, 11 May 2017 22:38:15 -0700 |
Martin von Zweigbergk |
rebase: rename "target" to "destination" in messages
|
file |
diff |
annotate
|
| Thu, 24 Dec 2015 20:41:40 +0000 |
timeless |
rebase: hook afterresolvedstates
|
file |
diff |
annotate
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Mon, 01 Jun 2015 18:05:38 +0000 |
Jordi Gutiérrez Hermoso |
phases: rewrite "immutable changeset" to "public changeset"
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:45:26 +0100 |
Mads Kiilerich |
rebase: show more useful status information while rebasing
|
file |
diff |
annotate
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
file |
diff |
annotate
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
file |
diff |
annotate
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
file |
diff |
annotate
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
file |
diff |
annotate
|
| Mon, 14 Oct 2013 16:12:29 +0200 |
Pierre-Yves David |
rebase: preserve working directory parent (BC)
|
file |
diff |
annotate
|
| Thu, 01 Aug 2013 17:54:12 -0500 |
Matt Mackall |
rebase: allow aborting when descendants detected
stable
|
file |
diff |
annotate
|
| Thu, 01 Aug 2013 17:45:13 -0500 |
Matt Mackall |
rebase: continue abort without strip for immutable csets (issue3997)
stable
|
file |
diff |
annotate
|
| Wed, 24 Jul 2013 23:51:44 -0500 |
Matt Mackall |
rebase: add checkunfinished support (issue3955)
stable
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 16:17:46 -0600 |
Augie Fackler |
dispatch: exit with status 1 for an InterventionRequired exception (bc)
|
file |
diff |
annotate
|
| Fri, 08 Feb 2013 16:27:59 -0600 |
Augie Fackler |
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
|
file |
diff |
annotate
|
| Mon, 18 Jun 2012 11:16:24 +0200 |
Dan Villiom Podlaski Christiansen |
rebase: improve error message on improper phases
stable
|
file |
diff |
annotate
|
| Tue, 17 Jan 2012 09:12:14 +0100 |
Alain Leufroy |
rebase: fix phases movement
|
file |
diff |
annotate
|
| Tue, 27 Dec 2011 00:11:22 +0100 |
Pierre-Yves David |
phases: prevent rebase to rebase immutable changeset.
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
file |
diff |
annotate
|
| Sat, 30 Oct 2010 16:58:15 -0500 |
Steve Borho |
rebase: improve resolve failure message
stable
|
file |
diff |
annotate
|
| Fri, 01 Oct 2010 16:10:06 +0200 |
Adrian Buehlmann |
tests: unify test-rebase*
|
file |
diff |
annotate
| base
|