Mercurial > hg
comparison tests/test-mq @ 3027:a4374f7331e4
Call patch.diff directly instead of printdiff - this also saves an
extra walk of the working directory.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Tue, 29 Aug 2006 17:08:55 -0700 |
parents | 61fcd9fac434 |
children | 760414dc7ac6 |
comparison
equal
deleted
inserted
replaced
3026:d838bfac668d | 3027:a4374f7331e4 |
---|---|
124 echo x>x | 124 echo x>x |
125 hg ci -Ama | 125 hg ci -Ama |
126 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' | 126 hg strip tip 2>&1 | sed 's/\(saving bundle to \).*/\1/' |
127 hg unbundle .hg/strip-backup/* | 127 hg unbundle .hg/strip-backup/* |
128 | 128 |
129 echo '% cd b; hg qrefresh' | |
130 hg init refresh | |
131 cd refresh | |
132 echo a > a | |
133 hg ci -Ama -d'0 0' | |
134 hg qnew -mfoo foo | |
135 echo a >> a | |
136 hg qrefresh | |
137 mkdir b | |
138 cd b | |
139 echo f > f | |
140 hg add f | |
141 hg qrefresh | |
142 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
143 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo | |
144 echo % hg qrefresh . | |
145 hg qrefresh . | |
146 sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
147 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo | |
148 hg status | |
149 | |
129 cat >>$HGRCPATH <<EOF | 150 cat >>$HGRCPATH <<EOF |
130 [diff] | 151 [diff] |
131 git = True | 152 git = True |
132 EOF | 153 EOF |
133 cd .. | 154 cd .. |