Mercurial > evolve
comparison tests/test-grab.t @ 3473:b2f591aa4507
grab: add grab info to cmdutil.afterresolvedstates
This will help us in showing how to continue the grab when user resolves all the
conflicts.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 02 Feb 2018 15:37:00 +0530 |
| parents | 32ed5b6fadd3 |
| children | 05fe5239fca2 |
comparison
equal
deleted
inserted
replaced
| 3472:05bd493d496d | 3473:b2f591aa4507 |
|---|---|
| 164 [1] | 164 [1] |
| 165 | 165 |
| 166 $ echo foobar > c | 166 $ echo foobar > c |
| 167 $ hg resolve --all --mark | 167 $ hg resolve --all --mark |
| 168 (no more unresolved files) | 168 (no more unresolved files) |
| 169 continue: hg grab --continue | |
| 169 $ hg grab --continue | 170 $ hg grab --continue |
| 170 $ hg glog | 171 $ hg glog |
| 171 @ 8:44e155eb95c7 add c | 172 @ 8:44e155eb95c7 add c |
| 172 | | 173 | |
| 173 o 7:2ccc03d1d096 foo to c | 174 o 7:2ccc03d1d096 foo to c |