Mercurial > hg
comparison tests/test-mq-qpush-exact.t @ 14256:d04ba50e104d
mq: allow to qpop/push with a dirty working copy (issue2780)
It's safe to do so if the sets of changed files in the
working copy and patches are disjoint.
| author | Idan Kamara <idankk86@gmail.com> |
|---|---|
| date | Fri, 06 May 2011 19:55:46 +0300 |
| parents | e1c34ce39fae |
| children | e9ed3506f066 |
comparison
equal
deleted
inserted
replaced
| 14255:576256a81cb6 | 14256:d04ba50e104d |
|---|---|
| 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 | 166 applying p0 |
| 167 [255] | 167 now at: p0 |
| 168 $ cat f0 | |
| 169 c0 | |
| 170 $ hg qpop -aq | |
| 171 patch queue now empty | |
| 168 $ hg qpush -ef | 172 $ hg qpush -ef |
| 169 applying p0 | 173 applying p0 |
| 170 now at: p0 | 174 now at: p0 |
| 171 $ cat f0 | 175 $ cat f0 |
| 172 c0 | 176 c0 |
| 176 patch queue now empty | 180 patch queue now empty |
| 177 | 181 |
| 178 $ hg update 1 -q | 182 $ hg update 1 -q |
| 179 $ echo c0 >> f0 | 183 $ echo c0 >> f0 |
| 180 $ hg qpush -e p1 | 184 $ hg qpush -e p1 |
| 181 abort: local changes found | 185 applying p0 |
| 182 [255] | 186 applying p1 |
| 187 now at: p1 | |
| 188 $ cat f0 | |
| 189 c0 | |
| 190 $ hg qpop -aq | |
| 191 patch queue now empty | |
| 183 $ hg qpush -e p1 -f | 192 $ hg qpush -e p1 -f |
| 184 applying p0 | 193 applying p0 |
| 185 applying p1 | 194 applying p1 |
| 186 now at: p1 | 195 now at: p1 |
| 187 $ cat f0 | 196 $ cat f0 |