Alain Leufroy
fd923bd6e3
rebase: fix phases movement
...
Rebase now try to keep the phases of source changesets.
2012-01-17 09:12:14 +01:00
Pierre-Yves David
7e4f710bf6
phases: prevent rebase to rebase immutable changeset.
2011-12-27 00:11:22 +01:00
Matt Mackall
309d28f3f5
merge with crew
2011-11-17 23:02:18 -06:00
Mads Kiilerich
9c95d62a3d
tests: add missing '(glob)'s to match '\' in paths in test output on windows
2011-11-16 03:45:14 +01:00
Matt Mackall
66de5cde16
merge: give a special message for internal:merge failure (issue3105)
2011-11-16 18:04:19 -06:00
Matt Mackall
8f2b7260c4
merge with stable
2011-11-10 11:00:27 -06:00
Stefano Tortarolo
b157d6deb9
rebase: ensure target is not taken as external (issue3085)
...
This could happen in specific situations in which 'target'
was selected as external and used for p1 _and_ p2.
2011-11-08 17:09:48 +01:00
Stefano Tortarolo
822926675c
rebase: treat nullmerge as a special case in rebasestate (issue3046)
...
When storing/restoring a nullmerge (-2), a 'standard' conversion was made
and an existing changeset was wrongly used.
Nullmerge should instead be treated as a special case.
2011-11-06 23:35:33 +01:00
Mads Kiilerich
8c22a0ec28
tests: make (glob) on windows accept \ instead of /
...
Globbing is usually used for filenames, so on windows it is reasonable and very
convenient that glob patterns accepts '\' or '/' when the pattern specifies
'/'.
2011-11-07 03:25:10 +01:00
Pierre-Yves David
d772591150
rebase: allow rebase to ancestor (issue3010)
...
We only deny rebasing onto direct parent. Thanks to the ancestor argument of
merge. the "implementation" of this feature only consist in loosing the check
and imply detach when rebasing on ancestor.
2011-09-19 16:57:13 +02:00
Nicolas Dumazet
cd356ed0bf
tests: change test-rebase-detach to use bundle/rebase.hg
2011-04-30 17:38:06 +02:00
Henrik Stuart
54e1841c4f
rebase: support --detach when null is common ancestor
2010-11-20 09:51:56 +01:00
Mads Kiilerich
3174ff376b
tests: remove redundant globs
...
Many globs now just match $TESTTMP and is no longer needed.
2010-10-08 22:36:10 -05:00
Adrian Buehlmann
1f4e98cf76
tests: unify test-rebase*
2010-10-01 16:10:06 +02:00
