| Wed, 21 Oct 2020 19:00:16 -0700 |
Martin von Zweigbergk |
errors: add config that lets user get more detailed exit codes
|
| Thu, 29 Oct 2020 00:17:12 -0700 |
Martin von Zweigbergk |
branching: merge with stable
|
| Tue, 27 Oct 2020 15:33:15 -0700 |
Martin von Zweigbergk |
rebase: change and standarize template for rebase's one-line summary
|
| Fri, 23 Oct 2020 22:20:08 -0400 |
Matt Harbison |
repoview: only pin obsolete wdir parents while there are unresolved conflicts
stable
|
| Fri, 04 Sep 2020 15:21:02 -0400 |
Matt Harbison |
repoview: pin revisions for `local` and `other` when a merge is active
stable
|
| Mon, 13 Jul 2020 16:42:44 -0700 |
Daniel Ploch |
error: unify the error message formats for 'rebase' and 'unshelve'
|
| Sun, 10 Dec 2017 22:50:57 -0500 |
Matt Harbison |
tests: remove (glob) annotations that were only for '\' matches
|
| Fri, 07 Jul 2017 18:51:46 -0700 |
Jun Wu |
rebase: use scmutil.cleanupnodes (issue5606) (BC)
|
| Thu, 24 Dec 2015 20:41:40 +0000 |
timeless |
rebase: hook afterresolvedstates
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
| Tue, 09 Dec 2014 03:45:26 +0100 |
Mads Kiilerich |
rebase: show more useful status information while rebasing
|
| Sun, 07 Dec 2014 20:04:45 +0100 |
Mads Kiilerich |
tests: make 'saved backup' globbing less narrow in rebase tests
|
| Sat, 26 Jul 2014 03:32:49 +0200 |
Pierre-Yves David |
resolve: add parenthesis around "no more unresolved files" message
stable
|
| Fri, 09 May 2014 14:46:50 -0500 |
Matt Mackall |
resolve: simplify "finished" message
|
| Fri, 18 Apr 2014 22:19:25 -0700 |
Gregory Szorc |
resolve: print message when no unresolved files remain (issue4214)
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
| Mon, 14 Oct 2013 16:12:29 +0200 |
Pierre-Yves David |
rebase: preserve working directory parent (BC)
|
| Fri, 08 Feb 2013 16:17:46 -0600 |
Augie Fackler |
dispatch: exit with status 1 for an InterventionRequired exception (bc)
|
| Fri, 08 Feb 2013 16:27:59 -0600 |
Augie Fackler |
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
| Tue, 17 Jan 2012 09:12:14 +0100 |
Alain Leufroy |
rebase: fix phases movement
|
| Tue, 27 Dec 2011 00:11:22 +0100 |
Pierre-Yves David |
phases: prevent rebase to rebase immutable changeset.
|
| Thu, 08 Dec 2011 16:01:44 -0600 |
Matt Mackall |
merge with stable
|
| Thu, 08 Dec 2011 14:32:44 -0600 |
Matt Mackall |
branch: warn on branching
stable
|
| Wed, 16 Nov 2011 18:04:19 -0600 |
Matt Mackall |
merge: give a special message for internal:merge failure (issue3105)
|
| Sat, 30 Oct 2010 16:58:15 -0500 |
Steve Borho |
rebase: improve resolve failure message
stable
|
| Fri, 08 Oct 2010 22:36:10 -0500 |
Mads Kiilerich |
tests: remove redundant globs
|
| Fri, 01 Oct 2010 16:10:06 +0200 |
Adrian Buehlmann |
tests: unify test-rebase*
base
tests/test-rebase-check-restore@e5863f5fe097
|
