Mercurial > hg

comparison tests/test-mq @ 3099:09e8aecd8016

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with backout
author Matt Mackall <mpm@selenic.com>
date Fri, 15 Sep 2006 16:01:16 -0500
parents 760414dc7ac6
children 534806df5b5a
comparison
equal deleted inserted replaced
3098:c27d1e1798a3 3099:09e8aecd8016
113 hg push ../../k 113 hg push ../../k
114 114
115 echo % qunapplied 115 echo % qunapplied
116 hg qunapplied 116 hg qunapplied
117 117
118 echo % qpush/qpop with index
119 hg qnew test1b.patch
120 echo 1b > 1b
121 hg add 1b
122 hg qrefresh
123 hg qpush 2
124 hg qpop 0
125 hg qpush test.patch+1
126 hg qpush test.patch+2
127 hg qpop test2.patch-1
128 hg qpop test2.patch-2
129 hg qpush test1b.patch+1
130
118 echo % push should succeed 131 echo % push should succeed
119 hg qpop -a 132 hg qpop -a
120 hg push ../../k 133 hg push ../../k
121 134
122 echo % strip 135 echo % strip
123 cd ../../b 136 cd ../../b
124 echo x>x 137 echo x>x
125 hg ci -Ama 138 hg ci -Ama
126 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' 139 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/'
127 hg unbundle .hg/strip-backup/* 140 hg unbundle .hg/strip-backup/*
141
142 echo '% cd b; hg qrefresh'
143 hg init refresh
144 cd refresh
145 echo a > a
146 hg ci -Ama -d'0 0'
147 hg qnew -mfoo foo
148 echo a >> a
149 hg qrefresh
150 mkdir b
151 cd b
152 echo f > f
153 hg add f
154 hg qrefresh
155 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
156 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
157 echo % hg qrefresh .
158 hg qrefresh .
159 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
160 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo
161 hg status
128 162
129 cat >>$HGRCPATH <<EOF 163 cat >>$HGRCPATH <<EOF
130 [diff] 164 [diff]
131 git = True 165 git = True
132 EOF 166 EOF