529 $ hg update 'desc("delete-the-file")' |
529 $ hg update 'desc("delete-the-file")' |
530 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
530 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
531 $ hg merge 'desc("updating-both-file")' -t :local |
531 $ hg merge 'desc("updating-both-file")' -t :local |
532 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
532 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
533 (branch merge, don't forget to commit) |
533 (branch merge, don't forget to commit) |
|
534 $ hg debugmergestate |
|
535 local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b |
|
536 other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071 |
|
537 file: the-file (state "r") |
|
538 local path: the-file (hash 0000000000000000000000000000000000000000, flags "") |
|
539 ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) |
|
540 other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460) |
|
541 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 |
|
542 extra: other-file (filenode-source = other) |
534 $ hg ci -m "merge-deleting-the-file-from-deleted" |
543 $ hg ci -m "merge-deleting-the-file-from-deleted" |
535 $ hg manifest |
544 $ hg manifest |
536 other-file |
545 other-file |
537 $ hg debugrevlogindex the-file |
546 $ hg debugrevlogindex the-file |
538 rev linkrev nodeid p1 p2 |
547 rev linkrev nodeid p1 p2 |
542 $ hg update 'desc("updating-both-file")' |
551 $ hg update 'desc("updating-both-file")' |
543 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
552 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
544 $ hg merge 'desc("delete-the-file")' -t :other |
553 $ hg merge 'desc("delete-the-file")' -t :other |
545 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
554 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
546 (branch merge, don't forget to commit) |
555 (branch merge, don't forget to commit) |
|
556 $ hg debugmergestate |
|
557 local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071 |
|
558 other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b |
|
559 file: the-file (state "r") |
|
560 local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "") |
|
561 ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) |
|
562 other path: the-file (node 0000000000000000000000000000000000000000) |
|
563 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 |
547 $ hg ci -m "merge-deleting-the-file-from-updated" |
564 $ hg ci -m "merge-deleting-the-file-from-updated" |
548 created new head |
565 created new head |
549 $ hg manifest |
566 $ hg manifest |
550 other-file |
567 other-file |
551 $ hg debugrevlogindex the-file |
568 $ hg debugrevlogindex the-file |
556 $ hg update 'desc("delete-the-file")' |
573 $ hg update 'desc("delete-the-file")' |
557 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
574 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
558 $ hg merge 'desc("updating-both-file")' -t :other |
575 $ hg merge 'desc("updating-both-file")' -t :other |
559 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
576 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
560 (branch merge, don't forget to commit) |
577 (branch merge, don't forget to commit) |
|
578 $ hg debugmergestate |
|
579 local (working copy): 7801bc9b9899de5e304bd162cafde9b78e10ab9b |
|
580 other (merge rev): 9b610631ab29024c5f44af7d2c19658ef8f8f071 |
|
581 file: the-file (state "r") |
|
582 local path: the-file (hash 0000000000000000000000000000000000000000, flags "") |
|
583 ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) |
|
584 other path: the-file (node 59e363a07dc876278f0e41756236f30213b6b460) |
|
585 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 |
|
586 extra: other-file (filenode-source = other) |
561 $ hg ci -m "merge-keeping-the-file-from-deleted" |
587 $ hg ci -m "merge-keeping-the-file-from-deleted" |
562 created new head |
588 created new head |
563 $ hg manifest |
589 $ hg manifest |
564 other-file |
590 other-file |
565 the-file |
591 the-file |
576 $ hg update 'desc("updating-both-file")' |
602 $ hg update 'desc("updating-both-file")' |
577 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
603 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
578 $ hg merge 'desc("delete-the-file")' -t :local |
604 $ hg merge 'desc("delete-the-file")' -t :local |
579 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
605 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
580 (branch merge, don't forget to commit) |
606 (branch merge, don't forget to commit) |
|
607 $ hg debugmergestate |
|
608 local (working copy): 9b610631ab29024c5f44af7d2c19658ef8f8f071 |
|
609 other (merge rev): 7801bc9b9899de5e304bd162cafde9b78e10ab9b |
|
610 file: the-file (state "r") |
|
611 local path: the-file (hash 6d2e02da5a9fe0691363dc6b573845fa271eaa35, flags "") |
|
612 ancestor path: the-file (node 4b69178b9bdae28b651393b46e631427a72f217a) |
|
613 other path: the-file (node 0000000000000000000000000000000000000000) |
|
614 extra: ancestorlinknode = 955800955977bd6c103836ee3e437276e940a589 |
581 $ hg ci -m "merge-keeping-the-file-from-updated" |
615 $ hg ci -m "merge-keeping-the-file-from-updated" |
582 created new head |
616 created new head |
583 $ hg manifest |
617 $ hg manifest |
584 other-file |
618 other-file |
585 the-file |
619 the-file |