Show More
@@ -343,6 +343,22 b' File conflict is not allowed' | |||
|
343 | 343 | $ hg resolve -l |
|
344 | 344 | U a |
|
345 | 345 | |
|
346 | Try to make empty commit while there are conflicts | |
|
347 | $ hg revert -r . a | |
|
348 | $ rm a.orig | |
|
349 | $ hg ci -m empty | |
|
350 | nothing changed | |
|
351 | [1] | |
|
352 | $ hg resolve -m a | |
|
353 | (no more unresolved files) | |
|
354 | $ hg resolve -l | |
|
355 | R a | |
|
356 | $ hg ci -m empty | |
|
357 | nothing changed | |
|
358 | [1] | |
|
359 | $ hg resolve -l | |
|
360 | R a | |
|
361 | ||
|
346 | 362 | Change/delete conflict is not allowed |
|
347 | 363 | $ hg up -qC 3 |
|
348 | 364 | $ hg rm foo |
General Comments 0
You need to be logged in to leave comments.
Login now