Mercurial > evolve
comparison tests/test-grab.t @ 4052:73e73471d6c6
pick: replace "grabstate" with "pickstate"
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 31 Aug 2018 09:20:21 +0200 |
| parents | 25981fae92f9 |
| children | ecbf61d90807 |
comparison
equal
deleted
inserted
replaced
| 4051:ddae36b4031e | 4052:73e73471d6c6 |
|---|---|
| 172 [1] | 172 [1] |
| 173 | 173 |
| 174 $ echo foobar > c | 174 $ echo foobar > c |
| 175 $ hg resolve --all --mark | 175 $ hg resolve --all --mark |
| 176 (no more unresolved files) | 176 (no more unresolved files) |
| 177 continue: hg grab --continue | 177 continue: hg pick --continue |
| 178 $ hg grab --continue | 178 $ hg grab --continue |
| 179 $ hg glog | 179 $ hg glog |
| 180 @ 8:44e155eb95c7 add c | 180 @ 8:44e155eb95c7 add c |
| 181 | | 181 | |
| 182 o 7:2ccc03d1d096 foo to c | 182 o 7:2ccc03d1d096 foo to c |
| 209 unresolved merge conflicts (see hg help resolve) | 209 unresolved merge conflicts (see hg help resolve) |
| 210 [1] | 210 [1] |
| 211 $ echo foobar > c | 211 $ echo foobar > c |
| 212 $ hg resolve -m | 212 $ hg resolve -m |
| 213 (no more unresolved files) | 213 (no more unresolved files) |
| 214 continue: hg grab --continue | 214 continue: hg pick --continue |
| 215 | 215 |
| 216 $ hg grab --continue | 216 $ hg grab --continue |
| 217 note: picking 9:4e04628911f6 created no changes to commit | 217 note: picking 9:4e04628911f6 created no changes to commit |
| 218 | 218 |
| 219 Testing the abort functionality of hg grab | 219 Testing the abort functionality of hg grab |
| 291 [1] | 291 [1] |
| 292 | 292 |
| 293 $ echo bar > b | 293 $ echo bar > b |
| 294 $ hg resolve -m | 294 $ hg resolve -m |
| 295 (no more unresolved files) | 295 (no more unresolved files) |
| 296 continue: hg grab --continue | 296 continue: hg pick --continue |
| 297 | 297 |
| 298 $ hg grab --continue | 298 $ hg grab --continue |
| 299 $ hg phase -r . | 299 $ hg phase -r . |
| 300 11: secret | 300 11: secret |
| 301 | 301 |