##// END OF EJS Templates
update: add some tests for the status quo of morestatus on update conflicts...
Rodrigo Damazio Bovendorp -
r44336:5709a999 default
parent child Browse files
Show More
@@ -1,3 +1,8 b''
1 $ cat >> $HGRCPATH <<EOF
2 > [commands]
3 > status.verbose=1
4 > EOF
5
1 6 # Construct the following history tree:
2 7 #
3 8 # @ 5:e1bb631146ca b1
@@ -308,6 +313,10 b' File conflict is not allowed'
308 313 use 'hg resolve' to retry unresolved file merges
309 314 [1]
310 315 $ rm a.orig
316 $ hg status
317 M a
318 $ hg resolve -l
319 U a
311 320
312 321 Change/delete conflict is not allowed
313 322 $ hg up -qC 3
@@ -536,10 +545,47 b' Test that we still warn also when there '
536 545 updated to hidden changeset 6efa171f091b
537 546 (hidden revision '6efa171f091b' was rewritten as: d047485b3896)
538 547 [1]
548
549 Test that statuses are reported properly before and after merge resolution.
550 $ rm a.orig
551 $ hg resolve -l
552 U a
553 $ hg status
554 M a
555 M foo
556
539 557 $ hg revert -r . a
558
559 $ rm a.orig
560 $ hg resolve -l
561 U a
562 $ hg status
563 M foo
564 $ hg status -Tjson
565 [
566 {
567 "itemtype": "file",
568 "path": "foo",
569 "status": "M"
570 }
571 ]
572
540 573 $ hg resolve -m
541 574 (no more unresolved files)
542 575
576 $ hg resolve -l
577 R a
578 $ hg status
579 M foo
580 $ hg status -Tjson
581 [
582 {
583 "itemtype": "file",
584 "path": "foo",
585 "status": "M"
586 }
587 ]
588
543 589 Test that 4 is detected as the no-argument destination from 3 and also moves
544 590 the bookmark with it
545 591 $ hg up --quiet 0 # we should be able to update to 3 directly
General Comments 0
You need to be logged in to leave comments. Login now