| Fri, 09 Oct 2015 13:54:52 -0700 |
Siddharth Agarwal |
simplemerge: move conflict warning message to filemerge
|
file |
diff |
annotate
|
| Fri, 09 Jan 2015 10:52:14 -0800 |
Durham Goode |
bundles: do not overwrite existing backup bundles (BC)
|
file |
diff |
annotate
|
| Wed, 10 Dec 2014 06:20:35 +0100 |
Mads Kiilerich |
rebase: show warning when rebase creates no changes to commit
|
file |
diff |
annotate
|
| Tue, 09 Dec 2014 03:45:26 +0100 |
Mads Kiilerich |
rebase: show more useful status information while rebasing
|
file |
diff |
annotate
|
| Sun, 07 Dec 2014 20:04:45 +0100 |
Mads Kiilerich |
tests: make 'saved backup' globbing less narrow in rebase tests
|
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
|
| Fri, 01 Nov 2013 17:08:06 -0700 |
Durham Goode |
rebase: fix working copy location after a --collapse (issue4080)
stable
|
file |
diff |
annotate
|
| Mon, 14 Oct 2013 16:12:29 +0200 |
Pierre-Yves David |
rebase: preserve working directory parent (BC)
|
file |
diff |
annotate
|
| Mon, 14 Oct 2013 16:49:54 +0200 |
Pierre-Yves David |
tests: prepare rebase test for wc parent preservation
|
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
|
| Fri, 15 Mar 2013 11:23:29 -0700 |
Durham Goode |
rebase: fix --collapse when a file was added then removed
|
file |
diff |
annotate
|
| Wed, 20 Jun 2012 20:08:57 +0200 |
Pierre-Yves David |
rebase: do not add second parent to rebased changeset (drop detach option) (BC)
|
file |
diff |
annotate
|
| Mon, 11 Jun 2012 01:40:51 +0200 |
Mads Kiilerich |
tests: add missing trailing 'cd ..'
|
file |
diff |
annotate
|
| Sun, 22 Apr 2012 20:06:36 +0200 |
Patrick Mezard |
rebase: skip resolved but emptied revisions
stable
|
file |
diff |
annotate
|
| Sun, 22 Apr 2012 18:27:50 +0200 |
Patrick Mezard |
test-rebase: exhibit revisions which should have been skipped
stable
|
file |
diff |
annotate
|
| Tue, 03 Apr 2012 19:06:35 +0200 |
Thomas Arendsen Hein |
tests: make tests work if directory contains special characters
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
|
| Thu, 17 Nov 2011 23:02:18 -0600 |
Matt Mackall |
merge with crew
|
file |
diff |
annotate
|
| Wed, 16 Nov 2011 03:45:14 +0100 |
Mads Kiilerich |
tests: add missing '(glob)'s to match '\' in paths in test output on windows
|
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
|
| Thu, 10 Nov 2011 11:00:27 -0600 |
Matt Mackall |
merge with stable
|
file |
diff |
annotate
|
| Tue, 08 Nov 2011 17:09:48 +0100 |
Stefano Tortarolo |
rebase: ensure target is not taken as external (issue3085)
stable
|
file |
diff |
annotate
|
| Sun, 06 Nov 2011 23:35:33 +0100 |
Stefano Tortarolo |
rebase: treat nullmerge as a special case in rebasestate (issue3046)
stable
|
file |
diff |
annotate
|
| Mon, 07 Nov 2011 03:25:10 +0100 |
Mads Kiilerich |
tests: make (glob) on windows accept \ instead of /
|
file |
diff |
annotate
|
| Mon, 19 Sep 2011 16:57:13 +0200 |
Pierre-Yves David |
rebase: allow rebase to ancestor (issue3010)
|
file |
diff |
annotate
|
| Sat, 30 Apr 2011 17:38:06 +0200 |
Nicolas Dumazet |
tests: change test-rebase-detach to use bundle/rebase.hg
|
file |
diff |
annotate
|
| Sat, 20 Nov 2010 09:51:56 +0100 |
Henrik Stuart |
rebase: support --detach when null is common ancestor
stable
|
file |
diff |
annotate
|
| Fri, 08 Oct 2010 22:36:10 -0500 |
Mads Kiilerich |
tests: remove redundant globs
|
file |
diff |
annotate
|
| Fri, 01 Oct 2010 16:10:06 +0200 |
Adrian Buehlmann |
tests: unify test-rebase*
|
file |
diff |
annotate
| base
|