Mercurial > hg
diff tests/test-rebase-mq @ 10672:c2e1e637d4da stable
rebase: always check if rebasing onto an applied mq patch.
Previously, it only checked for an mq patch if the user explicitly
passed -d/--dest. But rebasing onto an mq patch is a bad idea
regardless of how we determine the rebase destination.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 02 Mar 2010 15:08:43 -0500 |
parents | 8cb81d75730c |
children | b345b1cc124f |
line wrap: on
line diff
--- a/tests/test-rebase-mq Fri Mar 05 17:38:02 2010 -0500 +++ b/tests/test-rebase-mq Tue Mar 02 15:08:43 2010 -0500 @@ -45,6 +45,12 @@ hg rebase -s 1 -d 3 echo +echo '% Rebase - same thing, but mq patch is default dest' +hg update -q 1 +hg rebase +hg update -q qtip + +echo echo '% Rebase - generate a conflict' hg rebase -s 2 -d 1