Mercurial > hg

comparison tests/test-rebase-cache @ 11198:b345b1cc124f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: use helpers.sh in tests
author Matt Mackall <mpm@selenic.com>
date Wed, 19 May 2010 20:20:12 -0500
parents bae9bb09166b
children 2313dc4d9817
comparison
equal deleted inserted replaced
11197:4bb4895e1693 11198:b345b1cc124f
1 #!/bin/sh 1 #!/bin/sh
2
3 source $TESTDIR/helpers.sh
2 4
3 createrepo() { 5 createrepo() {
4 rm -rf repo 6 rm -rf repo
5 hg init repo 7 hg init repo
6 cd repo 8 cd repo
50 echo '% Heads' 52 echo '% Heads'
51 hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n' 53 hg heads --template '{rev}:{node|short} {desc} branch: {branches}\n'
52 54
53 echo 55 echo
54 echo '% Rebase part of branch2 (5-6) onto branch3 (8)' 56 echo '% Rebase part of branch2 (5-6) onto branch3 (8)'
55 hg --config extensions.hgext.rebase= rebase --detach -s 5 -d 8 2>&1 | sed 's/\(saving bundle to \).*/\1/' 57 hg --config extensions.hgext.rebase= rebase --detach -s 5 -d 8 | hidebackup
56 58
57 echo 59 echo
58 echo '% Branches' 60 echo '% Branches'
59 hg branches 61 hg branches
60 62
68 echo 70 echo
69 echo '% Rebase head of branch3 (8) onto branch2 (6)' 71 echo '% Rebase head of branch3 (8) onto branch2 (6)'
70 createrepo > /dev/null 2>&1 72 createrepo > /dev/null 2>&1
71 hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' 73 hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'
72 74
73 hg --config extensions.hgext.rebase= rebase --detach -s 8 -d 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' 75 hg --config extensions.hgext.rebase= rebase --detach -s 8 -d 6 | hidebackup
74 76
75 echo 77 echo
76 echo '% Branches' 78 echo '% Branches'
77 hg branches 79 hg branches
78 80
87 echo 89 echo
88 echo '% Rebase entire branch3 (7-8) onto branch2 (6)' 90 echo '% Rebase entire branch3 (7-8) onto branch2 (6)'
89 createrepo > /dev/null 2>&1 91 createrepo > /dev/null 2>&1
90 hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n' 92 hg --config extensions.hgext.graphlog= glog --template '{rev}:{node|short} {desc} branch: {branches}\n'
91 93
92 hg --config extensions.hgext.rebase= rebase --detach -s 7 -d 6 2>&1 | sed 's/\(saving bundle to \).*/\1/' 94 hg --config extensions.hgext.rebase= rebase --detach -s 7 -d 6 | hidebackup
93 95
94 echo 96 echo
95 echo '% Branches' 97 echo '% Branches'
96 hg branches 98 hg branches
97 99