Mercurial > hg-stable

comparison tests/test-rebase-pull @ 7786:92455c1d6f83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: pull --rebase updates if there is nothing to rebase
author Stefano Tortarolo <stefano.tortarolo@gmail.com>
date Sun, 18 Jan 2009 19:59:51 +0100
parents 93609576244e
children 8766fee6f225 aee8455ee8ec
comparison
equal deleted inserted replaced
7785:660c8dd44060 7786:92455c1d6f83
23 addcommit "C1" 0 23 addcommit "C1" 0
24 addcommit "C2" 1 24 addcommit "C2" 1
25 25
26 cd .. 26 cd ..
27 hg clone a b 27 hg clone a b
28 # This is needed to test pull --rebase
29 hg clone a c
30
28 cd b 31 cd b
29 addcommit "L1" 2 32 addcommit "L1" 2
30 33
31 cd ../a 34 cd ../a
32 addcommit "R1" 3 35 addcommit "R1" 3
42 echo 45 echo
43 echo "% Re-run pull --rebase" 46 echo "% Re-run pull --rebase"
44 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' 47 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/'
45 48
46 echo 49 echo
47 echo "% Invoke pull --rebase with --update" 50 echo "% Invoke pull --rebase and nothing to rebase"
48 hg pull --rebase --update 51 cd ../c
52 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/'
53 hg glog --template '{rev}\n' -l 1
54
55 echo
56 echo "% pull --rebase doesn't update if nothing has been pulled"
57 hg up 1
58 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/'
59 hg glog --template '{rev}\n' -l 1
49 60
50 exit 0 61 exit 0