equal
deleted
inserted
replaced
51 cd ../c |
51 cd ../c |
52 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' |
52 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' |
53 hg glog --template '{rev}\n' -l 1 |
53 hg glog --template '{rev}\n' -l 1 |
54 |
54 |
55 echo |
55 echo |
|
56 echo "% pull --rebase --update should ignore --update" |
|
57 hg pull --rebase --update 2>&1 | sed 's/\(pulling from \).*/\1/' |
|
58 |
|
59 echo |
56 echo "% pull --rebase doesn't update if nothing has been pulled" |
60 echo "% pull --rebase doesn't update if nothing has been pulled" |
57 hg up 1 |
61 hg up 1 |
58 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' |
62 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' |
59 hg glog --template '{rev}\n' -l 1 |
63 hg glog --template '{rev}\n' -l 1 |
60 |
64 |