Mercurial > hg
comparison tests/test-mq-qrefresh @ 10368:f05e0d54f424
Merge with crew-stable
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 07 Feb 2010 14:43:21 +0100 |
parents | 08a0f04b56bd b8801b58bbd8 |
children | 8cb81d75730c |
comparison
equal
deleted
inserted
replaced
10365:d757bc0c7865 | 10368:f05e0d54f424 |
---|---|
153 hg mv a b | 153 hg mv a b |
154 hg qrefresh | 154 hg qrefresh |
155 hg qdiff --nodates | 155 hg qdiff --nodates |
156 cd .. | 156 cd .. |
157 | 157 |
158 echo '% issue2025: qrefresh does not honor filtering options when tip != qtip' | |
159 hg init repo-2025 | |
160 cd repo-2025 | |
161 echo a > a | |
162 echo b > b | |
163 hg ci -qAm addab | |
164 echo a >> a | |
165 echo b >> b | |
166 hg qnew -f patch | |
167 hg up -qC 0 | |
168 echo c > c | |
169 hg ci -qAm addc | |
170 hg up -qC 1 | |
171 echo '% refresh with tip != qtip' | |
172 hg --config diff.nodates=1 qrefresh -I b 2>&1 \ | |
173 | sed 's/saving bundle.*/saving bundle.../g' | |
174 echo '% status after refresh' | |
175 hg st | |
176 echo '% b after refresh' | |
177 cat b | |
178 echo '% patch file after refresh' | |
179 cat .hg/patches/patch | |
180 cd .. | |
181 | |
182 | |
158 echo % issue1441 with git patches | 183 echo % issue1441 with git patches |
159 hg init repo-1441-git | 184 hg init repo-1441-git |
160 cd repo-1441-git | 185 cd repo-1441-git |
161 echo "[diff]" >> .hg/hgrc | 186 echo "[diff]" >> .hg/hgrc |
162 echo "git=True" >> .hg/hgrc | 187 echo "git=True" >> .hg/hgrc |