| Sat, 19 Mar 2016 18:37:10 -0700 |
Simon Farnsworth |
merge: save merge part labels for later reuse
|
| Sun, 07 Feb 2016 00:49:31 -0600 |
Matt Mackall |
merge with stable
|
| Fri, 05 Feb 2016 10:22:14 -0800 |
Durham Goode |
merge: add file ancestor linknode to mergestate
|
| Fri, 05 Feb 2016 01:56:46 +0000 |
timeless |
rebase: update working directory when aborting (issue5084)
stable
|
| Thu, 04 Feb 2016 23:30:49 +0000 |
timeless |
tests: fix rebase-abort directory nesting
|
| Wed, 18 Nov 2015 15:46:45 -0800 |
Siddharth Agarwal |
mergestate: handle additional record types specially
|
| Tue, 13 Oct 2015 14:06:51 -0700 |
Christian Delahousse |
rebase: properly abort when destination is public (issue4896)
|
| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
| Fri, 29 May 2015 22:23:58 +0200 |
Gilles Moris |
summary: move the parents phase marker to commit line (issue4688)
|
| Thu, 14 May 2015 17:38:38 +0200 |
Gilles Moris |
summary: add a phase line (draft, secret) to the output
|
| Sun, 10 May 2015 10:57:24 -0400 |
Jordi Gutiérrez Hermoso |
rebase: clear merge when aborting before any rebasing (issue4661)
stable
|
| Sun, 10 May 2015 10:02:15 -0400 |
Jordi Gutiérrez Hermoso |
test-rebase-abort: add test from issue4009
stable
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
| Wed, 10 Dec 2014 06:20:35 +0100 |
Mads Kiilerich |
rebase: show warning when rebase creates no changes to commit
|
| 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
|
| Thu, 30 Jan 2014 13:56:56 -0600 |
Matt Mackall |
rebase: abort cleanly when we encounter a damaged rebasestate (issue4155)
stable
|
| Thu, 23 Jan 2014 01:21:08 +0100 |
Simon Heimberg |
hgext: fix one typo in rebase
stable
|
| Fri, 22 Nov 2013 19:14:17 +0100 |
Martin Geisler |
tests: don't load unnecessary graphlog extension
|
| Mon, 04 Nov 2013 19:59:00 -0800 |
Durham Goode |
rebase: fix rebase aborts when 'tip-1' is public (issue4082)
stable
|
| Tue, 01 Oct 2013 00:35:07 +0900 |
FUJIWARA Katsunori |
rebase: catch RepoLookupError at restoring rebase state for summary
stable 2.7.2
|
| Tue, 01 Oct 2013 00:35:07 +0900 |
FUJIWARA Katsunori |
rebase: catch RepoLookupError at restoring rebase state for abort/continue
stable
|
| 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)
|
| Fri, 17 Aug 2012 13:58:18 -0700 |
timeless |
spelling: Construct
|
| 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.
|
| 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-abort@5ef65287225d
|
