Mercurial > evolve
comparison tests/test-uncommit.t @ 359:43f79983f638
merge with conflicting detection
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 11 Jul 2012 15:20:22 +0200 |
| parents | f4302a2079f4 56d4c6207ef9 |
| children | cdcdedc532b7 |
comparison
equal
deleted
inserted
replaced
| 353:8feb73f733cb | 359:43f79983f638 |
|---|---|
| 240 $ hg up -C 3 | 240 $ hg up -C 3 |
| 241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved | 241 8 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 242 Working directory parent is obsolete | 242 Working directory parent is obsolete |
| 243 $ hg --config extensions.purge= purge | 243 $ hg --config extensions.purge= purge |
| 244 $ hg uncommit -I 'set:added() and e' | 244 $ hg uncommit -I 'set:added() and e' |
| 245 2 new conflictings changesets | |
| 245 $ hg st --copies | 246 $ hg st --copies |
| 246 A e | 247 A e |
| 247 $ hg st --copies --change . | 248 $ hg st --copies --change . |
| 248 M b | 249 M b |
| 249 M d | 250 M d |
| 283 $ hg up -C 3 | 284 $ hg up -C 3 |
| 284 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 285 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 285 Working directory parent is obsolete | 286 Working directory parent is obsolete |
| 286 $ hg --config extensions.purge= purge | 287 $ hg --config extensions.purge= purge |
| 287 $ hg uncommit --all -X e | 288 $ hg uncommit --all -X e |
| 289 1 new conflictings changesets | |
| 288 $ hg st --copies | 290 $ hg st --copies |
| 289 M b | 291 M b |
| 290 M d | 292 M d |
| 291 M j | 293 M j |
| 292 M o | 294 M o |