Mercurial > hg
comparison tests/test-rebase-keep-branch @ 8270:3477ad0b1f2c
Merge with crew-stable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Fri, 01 May 2009 12:35:13 +0200 |
| parents | 8766fee6f225 609ce91670d0 |
| children | b345b1cc124f |
comparison
equal
deleted
inserted
replaced
| 8269:bb9f13974d8e | 8270:3477ad0b1f2c |
|---|---|
| 26 echo | 26 echo |
| 27 echo '% Rebase a branch while preserving the branch name' | 27 echo '% Rebase a branch while preserving the branch name' |
| 28 hg update -C 3 | 28 hg update -C 3 |
| 29 hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' | 29 hg rebase -b 4 -d 3 --keepbranches 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
| 30 hg glog --template '{rev}:{desc}:{branches}\n' | 30 hg glog --template '{rev}:{desc}:{branches}\n' |
| 31 echo '% dirstate branch should be "notdefault"' | |
| 32 hg branch |