Mercurial > hg-stable
comparison tests/test-mq-qpush-exact.t @ 14191:e1c34ce39fae
mq: don't suggest to refresh when qpushing with no applied patches
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Wed, 04 May 2011 23:12:23 +0300 |
| parents | 31ec4d7eb63f |
| children | d04ba50e104d |
comparison
equal
deleted
inserted
replaced
| 14190:8aab5a82685f | 14191:e1c34ce39fae |
|---|---|
| 161 qpush --exact --force with changes to an unpatched file | 161 qpush --exact --force with changes to an unpatched file |
| 162 | 162 |
| 163 $ hg update 1 -q | 163 $ hg update 1 -q |
| 164 $ echo c0 >> f0 | 164 $ echo c0 >> f0 |
| 165 $ hg qpush -e | 165 $ hg qpush -e |
| 166 abort: local changes found, refresh first | 166 abort: local changes found |
| 167 [255] | 167 [255] |
| 168 $ hg qpush -ef | 168 $ hg qpush -ef |
| 169 applying p0 | 169 applying p0 |
| 170 now at: p0 | 170 now at: p0 |
| 171 $ cat f0 | 171 $ cat f0 |
| 176 patch queue now empty | 176 patch queue now empty |
| 177 | 177 |
| 178 $ hg update 1 -q | 178 $ hg update 1 -q |
| 179 $ echo c0 >> f0 | 179 $ echo c0 >> f0 |
| 180 $ hg qpush -e p1 | 180 $ hg qpush -e p1 |
| 181 abort: local changes found, refresh first | 181 abort: local changes found |
| 182 [255] | 182 [255] |
| 183 $ hg qpush -e p1 -f | 183 $ hg qpush -e p1 -f |
| 184 applying p0 | 184 applying p0 |
| 185 applying p1 | 185 applying p1 |
| 186 now at: p1 | 186 now at: p1 |
| 195 | 195 |
| 196 $ hg update 1 -q | 196 $ hg update 1 -q |
| 197 $ echo cp0-bad >> fp0 | 197 $ echo cp0-bad >> fp0 |
| 198 $ hg add fp0 | 198 $ hg add fp0 |
| 199 $ hg qpush -e | 199 $ hg qpush -e |
| 200 abort: local changes found, refresh first | 200 abort: local changes found |
| 201 [255] | 201 [255] |
| 202 $ hg qpush -ef | 202 $ hg qpush -ef |
| 203 applying p0 | 203 applying p0 |
| 204 file fp0 already exists | 204 file fp0 already exists |
| 205 1 out of 1 hunks FAILED -- saving rejects to file fp0.rej | 205 1 out of 1 hunks FAILED -- saving rejects to file fp0.rej |
| 221 | 221 |
| 222 $ hg update 1 -q | 222 $ hg update 1 -q |
| 223 $ echo cp1-bad >> fp1 | 223 $ echo cp1-bad >> fp1 |
| 224 $ hg add fp1 | 224 $ hg add fp1 |
| 225 $ hg qpush -e p1 | 225 $ hg qpush -e p1 |
| 226 abort: local changes found, refresh first | 226 abort: local changes found |
| 227 [255] | 227 [255] |
| 228 $ hg qpush -e p1 -f | 228 $ hg qpush -e p1 -f |
| 229 applying p0 | 229 applying p0 |
| 230 applying p1 | 230 applying p1 |
| 231 file fp1 already exists | 231 file fp1 already exists |