Mercurial > hg

comparison tests/test-rebase-mq @ 10672:c2e1e637d4da stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
10669:181cbb23572e 10672:c2e1e637d4da
41 hg glog --template '{rev} {desc} tags: {tags}\n' 41 hg glog --template '{rev} {desc} tags: {tags}\n'
42 42
43 echo 43 echo
44 echo '% Rebase - try to rebase on an applied mq patch' 44 echo '% Rebase - try to rebase on an applied mq patch'
45 hg rebase -s 1 -d 3 45 hg rebase -s 1 -d 3
46
47 echo
48 echo '% Rebase - same thing, but mq patch is default dest'
49 hg update -q 1
50 hg rebase
51 hg update -q qtip
46 52
47 echo 53 echo
48 echo '% Rebase - generate a conflict' 54 echo '% Rebase - generate a conflict'
49 hg rebase -s 2 -d 1 55 hg rebase -s 2 -d 1
50 56