Show More
@@ -591,9 +591,9 b' def getremove(repo, mctx, overwrite, arg' | |||||
591 | wwrite = repo.wwrite |
|
591 | wwrite = repo.wwrite | |
592 | audit = repo.wopener.audit |
|
592 | audit = repo.wopener.audit | |
593 | i = 0 |
|
593 | i = 0 | |
594 | for arg in args: |
|
594 | for f, m, args, msg in args: | |
595 | f = arg[0] |
|
595 | repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) | |
596 |
if |
|
596 | if m == 'r': | |
597 | if verbose: |
|
597 | if verbose: | |
598 | repo.ui.note(_("removing %s\n") % f) |
|
598 | repo.ui.note(_("removing %s\n") % f) | |
599 | audit(f) |
|
599 | audit(f) | |
@@ -605,7 +605,7 b' def getremove(repo, mctx, overwrite, arg' | |||||
605 | else: |
|
605 | else: | |
606 | if verbose: |
|
606 | if verbose: | |
607 | repo.ui.note(_("getting %s\n") % f) |
|
607 | repo.ui.note(_("getting %s\n") % f) | |
608 |
wwrite(f, fctx(f).data(), arg |
|
608 | wwrite(f, fctx(f).data(), args[0]) | |
609 | if i == 100: |
|
609 | if i == 100: | |
610 | yield i, f |
|
610 | yield i, f | |
611 | i = 0 |
|
611 | i = 0 | |
@@ -632,12 +632,11 b' def applyupdates(repo, actions, wctx, mc' | |||||
632 | # prescan for merges |
|
632 | # prescan for merges | |
633 | for a in actions: |
|
633 | for a in actions: | |
634 | f, m, args, msg = a |
|
634 | f, m, args, msg = a | |
635 | repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m)) |
|
|||
636 | if m == "m": # merge |
|
635 | if m == "m": # merge | |
637 | f1, f2, fa, move, anc = args |
|
636 | f1, f2, fa, move, anc = args | |
638 | if f == '.hgsubstate': # merged internally |
|
637 | if f == '.hgsubstate': # merged internally | |
639 | continue |
|
638 | continue | |
640 |
repo.ui.debug(" |
|
639 | repo.ui.debug(" preserving %s for resolve of %s\n" % (f1, f)) | |
641 | fcl = wctx[f1] |
|
640 | fcl = wctx[f1] | |
642 | fco = mctx[f2] |
|
641 | fco = mctx[f2] | |
643 | actx = repo[anc] |
|
642 | actx = repo[anc] | |
@@ -667,7 +666,7 b' def applyupdates(repo, actions, wctx, mc' | |||||
667 | updated = len(updateactions) |
|
666 | updated = len(updateactions) | |
668 | removeactions = [a for a in workeractions if a[1] == 'r'] |
|
667 | removeactions = [a for a in workeractions if a[1] == 'r'] | |
669 | removed = len(removeactions) |
|
668 | removed = len(removeactions) | |
670 |
actions = [a for a in actions if a[1] not in 'gr |
|
669 | actions = [a for a in actions if a[1] not in 'gr'] | |
671 |
|
670 | |||
672 | hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate'] |
|
671 | hgsub = [a[1] for a in workeractions if a[0] == '.hgsubstate'] | |
673 | if hgsub and hgsub[0] == 'r': |
|
672 | if hgsub and hgsub[0] == 'r': | |
@@ -691,10 +690,30 b' def applyupdates(repo, actions, wctx, mc' | |||||
691 | if hgsub and hgsub[0] == 'g': |
|
690 | if hgsub and hgsub[0] == 'g': | |
692 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) |
|
691 | subrepo.submerge(repo, wctx, mctx, wctx, overwrite) | |
693 |
|
692 | |||
694 |
for |
|
693 | for f, m, args, msg in actions: | |
695 | f, m, args, msg = a |
|
694 | ||
696 | progress(_updating, z + i + 1, item=f, total=numupdates, unit=_files) |
|
695 | # forget (manifest only, just log it) (must come first) | |
697 |
if m == " |
|
696 | if m == "f": | |
|
697 | repo.ui.debug(" %s: %s -> f\n" % (f, msg)) | |||
|
698 | z += 1 | |||
|
699 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
|
700 | ||||
|
701 | # re-add (manifest only, just log it) | |||
|
702 | elif m == "a": | |||
|
703 | repo.ui.debug(" %s: %s -> a\n" % (f, msg)) | |||
|
704 | z += 1 | |||
|
705 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
|
706 | ||||
|
707 | # keep (noop, just log it) | |||
|
708 | elif m == "k": | |||
|
709 | repo.ui.debug(" %s: %s -> k\n" % (f, msg)) | |||
|
710 | # no progress | |||
|
711 | ||||
|
712 | # merge | |||
|
713 | elif m == "m": | |||
|
714 | repo.ui.debug(" %s: %s -> m\n" % (f, msg)) | |||
|
715 | z += 1 | |||
|
716 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
698 | f1, f2, fa, move, anc = args |
|
717 | f1, f2, fa, move, anc = args | |
699 | if f == '.hgsubstate': # subrepo states need updating |
|
718 | if f == '.hgsubstate': # subrepo states need updating | |
700 | subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |
|
719 | subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), | |
@@ -709,35 +728,61 b' def applyupdates(repo, actions, wctx, mc' | |||||
709 | updated += 1 |
|
728 | updated += 1 | |
710 | else: |
|
729 | else: | |
711 | merged += 1 |
|
730 | merged += 1 | |
712 | elif m == "dm": # directory rename, move local |
|
731 | ||
|
732 | # directory rename, move local | |||
|
733 | elif m == "dm": | |||
|
734 | repo.ui.debug(" %s: %s -> dm\n" % (f, msg)) | |||
|
735 | z += 1 | |||
|
736 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
713 | f0, flags = args |
|
737 | f0, flags = args | |
714 | repo.ui.note(_("moving %s to %s\n") % (f0, f)) |
|
738 | repo.ui.note(_("moving %s to %s\n") % (f0, f)) | |
715 | audit(f) |
|
739 | audit(f) | |
716 | repo.wwrite(f, wctx.filectx(f0).data(), flags) |
|
740 | repo.wwrite(f, wctx.filectx(f0).data(), flags) | |
717 | util.unlinkpath(repo.wjoin(f0)) |
|
741 | util.unlinkpath(repo.wjoin(f0)) | |
718 | updated += 1 |
|
742 | updated += 1 | |
719 | elif m == "dg": # local directory rename, get |
|
743 | ||
|
744 | # local directory rename, get | |||
|
745 | elif m == "dg": | |||
|
746 | repo.ui.debug(" %s: %s -> dg\n" % (f, msg)) | |||
|
747 | z += 1 | |||
|
748 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
720 | f0, flags = args |
|
749 | f0, flags = args | |
721 | repo.ui.note(_("getting %s to %s\n") % (f0, f)) |
|
750 | repo.ui.note(_("getting %s to %s\n") % (f0, f)) | |
722 | repo.wwrite(f, mctx.filectx(f0).data(), flags) |
|
751 | repo.wwrite(f, mctx.filectx(f0).data(), flags) | |
723 | updated += 1 |
|
752 | updated += 1 | |
724 | elif m == "dr": # divergent renames |
|
753 | ||
|
754 | # divergent renames | |||
|
755 | elif m == "dr": | |||
|
756 | repo.ui.debug(" %s: %s -> dr\n" % (f, msg)) | |||
|
757 | z += 1 | |||
|
758 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
725 | fl, = args |
|
759 | fl, = args | |
726 | repo.ui.warn(_("note: possible conflict - %s was renamed " |
|
760 | repo.ui.warn(_("note: possible conflict - %s was renamed " | |
727 | "multiple times to:\n") % f) |
|
761 | "multiple times to:\n") % f) | |
728 | for nf in fl: |
|
762 | for nf in fl: | |
729 | repo.ui.warn(" %s\n" % nf) |
|
763 | repo.ui.warn(" %s\n" % nf) | |
730 | elif m == "rd": # rename and delete |
|
764 | ||
|
765 | # rename and delete | |||
|
766 | elif m == "rd": | |||
|
767 | repo.ui.debug(" %s: %s -> rd\n" % (f, msg)) | |||
|
768 | z += 1 | |||
|
769 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
731 | fl, = args |
|
770 | fl, = args | |
732 | repo.ui.warn(_("note: possible conflict - %s was deleted " |
|
771 | repo.ui.warn(_("note: possible conflict - %s was deleted " | |
733 | "and renamed to:\n") % f) |
|
772 | "and renamed to:\n") % f) | |
734 | for nf in fl: |
|
773 | for nf in fl: | |
735 | repo.ui.warn(" %s\n" % nf) |
|
774 | repo.ui.warn(" %s\n" % nf) | |
736 | elif m == "e": # exec |
|
775 | ||
|
776 | # exec | |||
|
777 | elif m == "e": | |||
|
778 | repo.ui.debug(" %s: %s -> e\n" % (f, msg)) | |||
|
779 | z += 1 | |||
|
780 | progress(_updating, z, item=f, total=numupdates, unit=_files) | |||
737 | flags, = args |
|
781 | flags, = args | |
738 | audit(f) |
|
782 | audit(f) | |
739 | util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
|
783 | util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) | |
740 | updated += 1 |
|
784 | updated += 1 | |
|
785 | ||||
741 | ms.commit() |
|
786 | ms.commit() | |
742 | progress(_updating, None, total=numupdates, unit=_files) |
|
787 | progress(_updating, None, total=numupdates, unit=_files) | |
743 |
|
788 | |||
@@ -764,7 +809,7 b' def calculateupdates(repo, wctx, mctx, a' | |||||
764 | actions = manifestmerge(repo, wctx, mctx, ancestor, |
|
809 | actions = manifestmerge(repo, wctx, mctx, ancestor, | |
765 | branchmerge, force, |
|
810 | branchmerge, force, | |
766 | partial, acceptremote, followcopies) |
|
811 | partial, acceptremote, followcopies) | |
767 | for a in sorted(actions): |
|
812 | for a in sorted(actions, key=lambda a: (a[1], a)): | |
768 | f, m, args, msg = a |
|
813 | f, m, args, msg = a | |
769 | repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m)) |
|
814 | repo.ui.debug(' %s: %s -> %s\n' % (f, msg, m)) | |
770 | if f in fbids: |
|
815 | if f in fbids: | |
@@ -849,28 +894,41 b' def calculateupdates(repo, wctx, mctx, a' | |||||
849 | def recordupdates(repo, actions, branchmerge): |
|
894 | def recordupdates(repo, actions, branchmerge): | |
850 | "record merge actions to the dirstate" |
|
895 | "record merge actions to the dirstate" | |
851 |
|
896 | |||
852 | for a in actions: |
|
897 | for f, m, args, msg in actions: | |
853 | f, m, args, msg = a |
|
898 | ||
854 |
|
|
899 | # remove (must come first) | |
|
900 | if m == "r": # remove | |||
855 | if branchmerge: |
|
901 | if branchmerge: | |
856 | repo.dirstate.remove(f) |
|
902 | repo.dirstate.remove(f) | |
857 | else: |
|
903 | else: | |
858 | repo.dirstate.drop(f) |
|
904 | repo.dirstate.drop(f) | |
859 | elif m == "f": # forget (must come first) |
|
905 | ||
|
906 | # forget (must come first) | |||
|
907 | elif m == "f": | |||
860 | repo.dirstate.drop(f) |
|
908 | repo.dirstate.drop(f) | |
861 | elif m == "a": # re-add |
|
909 | ||
|
910 | # re-add | |||
|
911 | elif m == "a": | |||
862 | if not branchmerge: |
|
912 | if not branchmerge: | |
863 | repo.dirstate.add(f) |
|
913 | repo.dirstate.add(f) | |
864 | elif m == "e": # exec change |
|
914 | ||
|
915 | # exec change | |||
|
916 | elif m == "e": | |||
865 | repo.dirstate.normallookup(f) |
|
917 | repo.dirstate.normallookup(f) | |
866 | elif m == "k": # keep |
|
918 | ||
|
919 | # keep | |||
|
920 | elif m == "k": | |||
867 | pass |
|
921 | pass | |
868 | elif m == "g": # get |
|
922 | ||
|
923 | # get | |||
|
924 | elif m == "g": | |||
869 | if branchmerge: |
|
925 | if branchmerge: | |
870 | repo.dirstate.otherparent(f) |
|
926 | repo.dirstate.otherparent(f) | |
871 | else: |
|
927 | else: | |
872 | repo.dirstate.normal(f) |
|
928 | repo.dirstate.normal(f) | |
873 | elif m == "m": # merge |
|
929 | ||
|
930 | # merge | |||
|
931 | elif m == "m": | |||
874 | f1, f2, fa, move, anc = args |
|
932 | f1, f2, fa, move, anc = args | |
875 | if branchmerge: |
|
933 | if branchmerge: | |
876 | # We've done a branch merge, mark this file as merged |
|
934 | # We've done a branch merge, mark this file as merged | |
@@ -893,7 +951,9 b' def recordupdates(repo, actions, branchm' | |||||
893 | repo.dirstate.normallookup(f) |
|
951 | repo.dirstate.normallookup(f) | |
894 | if move: |
|
952 | if move: | |
895 | repo.dirstate.drop(f1) |
|
953 | repo.dirstate.drop(f1) | |
896 | elif m == "dm": # directory rename, move local |
|
954 | ||
|
955 | # directory rename, move local | |||
|
956 | elif m == "dm": | |||
897 | f0, flag = args |
|
957 | f0, flag = args | |
898 | if f0 not in repo.dirstate: |
|
958 | if f0 not in repo.dirstate: | |
899 | # untracked file moved |
|
959 | # untracked file moved | |
@@ -905,7 +965,9 b' def recordupdates(repo, actions, branchm' | |||||
905 | else: |
|
965 | else: | |
906 | repo.dirstate.normal(f) |
|
966 | repo.dirstate.normal(f) | |
907 | repo.dirstate.drop(f0) |
|
967 | repo.dirstate.drop(f0) | |
908 | elif m == "dg": # directory rename, get |
|
968 | ||
|
969 | # directory rename, get | |||
|
970 | elif m == "dg": | |||
909 | f0, flag = args |
|
971 | f0, flag = args | |
910 | if branchmerge: |
|
972 | if branchmerge: | |
911 | repo.dirstate.add(f) |
|
973 | repo.dirstate.add(f) |
@@ -31,16 +31,16 b'' | |||||
31 | resolving manifests |
|
31 | resolving manifests | |
32 | branchmerge: True, force: False, partial: False |
|
32 | branchmerge: True, force: False, partial: False | |
33 | ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 |
|
33 | ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6 | |
|
34 | preserving a for resolve of b | |||
|
35 | preserving a for resolve of c | |||
|
36 | removing a | |||
34 | b: remote moved from a -> m |
|
37 | b: remote moved from a -> m | |
35 | preserving a for resolve of b |
|
|||
36 | c: remote moved from a -> m |
|
|||
37 | preserving a for resolve of c |
|
|||
38 | removing a |
|
|||
39 | updating: b 1/2 files (50.00%) |
|
38 | updating: b 1/2 files (50.00%) | |
40 | picked tool 'internal:merge' for b (binary False symlink False) |
|
39 | picked tool 'internal:merge' for b (binary False symlink False) | |
41 | merging a and b to b |
|
40 | merging a and b to b | |
42 | my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc |
|
41 | my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc | |
43 | premerge successful |
|
42 | premerge successful | |
|
43 | c: remote moved from a -> m | |||
44 | updating: c 2/2 files (100.00%) |
|
44 | updating: c 2/2 files (100.00%) | |
45 | picked tool 'internal:merge' for c (binary False symlink False) |
|
45 | picked tool 'internal:merge' for c (binary False symlink False) | |
46 | merging a and c to c |
|
46 | merging a and c to c |
@@ -35,15 +35,15 b" we get conflicts that shouldn't be there" | |||||
35 | resolving manifests |
|
35 | resolving manifests | |
36 | branchmerge: True, force: False, partial: False |
|
36 | branchmerge: True, force: False, partial: False | |
37 | ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 |
|
37 | ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104 | |
|
38 | preserving foo for resolve of bar | |||
|
39 | preserving foo for resolve of foo | |||
38 | bar: remote copied from foo -> m |
|
40 | bar: remote copied from foo -> m | |
39 | preserving foo for resolve of bar |
|
|||
40 | foo: versions differ -> m |
|
|||
41 | preserving foo for resolve of foo |
|
|||
42 | updating: bar 1/2 files (50.00%) |
|
41 | updating: bar 1/2 files (50.00%) | |
43 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
42 | picked tool 'internal:merge' for bar (binary False symlink False) | |
44 | merging foo and bar to bar |
|
43 | merging foo and bar to bar | |
45 | my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc |
|
44 | my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc | |
46 | premerge successful |
|
45 | premerge successful | |
|
46 | foo: versions differ -> m | |||
47 | updating: foo 2/2 files (100.00%) |
|
47 | updating: foo 2/2 files (100.00%) | |
48 | picked tool 'internal:merge' for foo (binary False symlink False) |
|
48 | picked tool 'internal:merge' for foo (binary False symlink False) | |
49 | merging foo |
|
49 | merging foo |
@@ -137,8 +137,8 b' Graft out of order, skipping a merge and' | |||||
137 | resolving manifests |
|
137 | resolving manifests | |
138 | branchmerge: True, force: True, partial: False |
|
138 | branchmerge: True, force: True, partial: False | |
139 | ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 |
|
139 | ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6 | |
|
140 | preserving b for resolve of b | |||
140 | b: local copied/moved from a -> m |
|
141 | b: local copied/moved from a -> m | |
141 | preserving b for resolve of b |
|
|||
142 | updating: b 1/1 files (100.00%) |
|
142 | updating: b 1/1 files (100.00%) | |
143 | picked tool 'internal:merge' for b (binary False symlink False) |
|
143 | picked tool 'internal:merge' for b (binary False symlink False) | |
144 | merging b and a to b |
|
144 | merging b and a to b | |
@@ -151,21 +151,21 b' Graft out of order, skipping a merge and' | |||||
151 | branchmerge: True, force: True, partial: False |
|
151 | branchmerge: True, force: True, partial: False | |
152 | ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 |
|
152 | ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746 | |
153 | e: remote is newer -> g |
|
153 | e: remote is newer -> g | |
154 | b: keep -> k |
|
|||
155 | getting e |
|
154 | getting e | |
156 | updating: e 1/1 files (100.00%) |
|
155 | updating: e 1/1 files (100.00%) | |
|
156 | b: keep -> k | |||
157 | e |
|
157 | e | |
158 | grafting revision 4 |
|
158 | grafting revision 4 | |
159 | searching for copies back to rev 1 |
|
159 | searching for copies back to rev 1 | |
160 | resolving manifests |
|
160 | resolving manifests | |
161 | branchmerge: True, force: True, partial: False |
|
161 | branchmerge: True, force: True, partial: False | |
162 | ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d |
|
162 | ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d | |
|
163 | preserving e for resolve of e | |||
163 | d: remote is newer -> g |
|
164 | d: remote is newer -> g | |
|
165 | getting d | |||
|
166 | updating: d 1/2 files (50.00%) | |||
164 | b: keep -> k |
|
167 | b: keep -> k | |
165 | e: versions differ -> m |
|
168 | e: versions differ -> m | |
166 | preserving e for resolve of e |
|
|||
167 | getting d |
|
|||
168 | updating: d 1/2 files (50.00%) |
|
|||
169 | updating: e 2/2 files (100.00%) |
|
169 | updating: e 2/2 files (100.00%) | |
170 | picked tool 'internal:merge' for e (binary False symlink False) |
|
170 | picked tool 'internal:merge' for e (binary False symlink False) | |
171 | merging e |
|
171 | merging e |
@@ -35,12 +35,12 b' http://mercurial.selenic.com/bts/issue67' | |||||
35 | branchmerge: True, force: False, partial: False |
|
35 | branchmerge: True, force: False, partial: False | |
36 | ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a |
|
36 | ancestor: 81f4b099af3d, local: c64f439569a9+, remote: c12dcd37c90a | |
37 | 1: other deleted -> r |
|
37 | 1: other deleted -> r | |
38 | 1a: remote created -> g |
|
|||
39 | 2: keep -> k |
|
|||
40 | removing 1 |
|
38 | removing 1 | |
41 | updating: 1 1/2 files (50.00%) |
|
39 | updating: 1 1/2 files (50.00%) | |
|
40 | 1a: remote created -> g | |||
42 | getting 1a |
|
41 | getting 1a | |
43 | updating: 1a 2/2 files (100.00%) |
|
42 | updating: 1a 2/2 files (100.00%) | |
|
43 | 2: keep -> k | |||
44 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
44 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
45 | (branch merge, don't forget to commit) |
|
45 | (branch merge, don't forget to commit) | |
46 |
|
46 | |||
@@ -66,8 +66,8 b' http://mercurial.selenic.com/bts/issue67' | |||||
66 | resolving manifests |
|
66 | resolving manifests | |
67 | branchmerge: True, force: False, partial: False |
|
67 | branchmerge: True, force: False, partial: False | |
68 | ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 |
|
68 | ancestor: c64f439569a9, local: e327dca35ac8+, remote: 746e9549ea96 | |
|
69 | preserving 1a for resolve of 1a | |||
69 | 1a: local copied/moved from 1 -> m |
|
70 | 1a: local copied/moved from 1 -> m | |
70 | preserving 1a for resolve of 1a |
|
|||
71 | updating: 1a 1/1 files (100.00%) |
|
71 | updating: 1a 1/1 files (100.00%) | |
72 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
72 | picked tool 'internal:merge' for 1a (binary False symlink False) | |
73 | merging 1a and 1 to 1a |
|
73 | merging 1a and 1 to 1a | |
@@ -89,9 +89,9 b' http://mercurial.selenic.com/bts/issue67' | |||||
89 | resolving manifests |
|
89 | resolving manifests | |
90 | branchmerge: True, force: False, partial: False |
|
90 | branchmerge: True, force: False, partial: False | |
91 | ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 |
|
91 | ancestor: c64f439569a9, local: 746e9549ea96+, remote: e327dca35ac8 | |
|
92 | preserving 1 for resolve of 1a | |||
|
93 | removing 1 | |||
92 | 1a: remote moved from 1 -> m |
|
94 | 1a: remote moved from 1 -> m | |
93 | preserving 1 for resolve of 1a |
|
|||
94 | removing 1 |
|
|||
95 | updating: 1a 1/1 files (100.00%) |
|
95 | updating: 1a 1/1 files (100.00%) | |
96 | picked tool 'internal:merge' for 1a (binary False symlink False) |
|
96 | picked tool 'internal:merge' for 1a (binary False symlink False) | |
97 | merging 1 and 1a to 1a |
|
97 | merging 1 and 1a to 1a |
@@ -71,8 +71,8 b' This should use bar@rev2 as the ancestor' | |||||
71 | resolving manifests |
|
71 | resolving manifests | |
72 | branchmerge: True, force: False, partial: False |
|
72 | branchmerge: True, force: False, partial: False | |
73 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
|
73 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 | |
|
74 | preserving bar for resolve of bar | |||
74 | bar: versions differ -> m |
|
75 | bar: versions differ -> m | |
75 | preserving bar for resolve of bar |
|
|||
76 | updating: bar 1/1 files (100.00%) |
|
76 | updating: bar 1/1 files (100.00%) | |
77 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
77 | picked tool 'internal:merge' for bar (binary False symlink False) | |
78 | merging bar |
|
78 | merging bar | |
@@ -158,8 +158,8 b' This should use bar@rev2 as the ancestor' | |||||
158 | resolving manifests |
|
158 | resolving manifests | |
159 | branchmerge: True, force: False, partial: False |
|
159 | branchmerge: True, force: False, partial: False | |
160 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
|
160 | ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 | |
|
161 | preserving bar for resolve of bar | |||
161 | bar: versions differ -> m |
|
162 | bar: versions differ -> m | |
162 | preserving bar for resolve of bar |
|
|||
163 | updating: bar 1/1 files (100.00%) |
|
163 | updating: bar 1/1 files (100.00%) | |
164 | picked tool 'internal:merge' for bar (binary False symlink False) |
|
164 | picked tool 'internal:merge' for bar (binary False symlink False) | |
165 | merging bar |
|
165 | merging bar |
@@ -81,11 +81,11 b' Criss cross merging' | |||||
81 | resolving manifests |
|
81 | resolving manifests | |
82 | branchmerge: True, force: False, partial: False |
|
82 | branchmerge: True, force: False, partial: False | |
83 | ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 |
|
83 | ancestor: 0f6b37dbe527, local: 3b08d01b0ab5+, remote: adfe50279922 | |
|
84 | preserving f2 for resolve of f2 | |||
84 | f1: remote is newer -> g |
|
85 | f1: remote is newer -> g | |
85 | f2: versions differ -> m |
|
|||
86 | preserving f2 for resolve of f2 |
|
|||
87 | getting f1 |
|
86 | getting f1 | |
88 | updating: f1 1/2 files (50.00%) |
|
87 | updating: f1 1/2 files (50.00%) | |
|
88 | f2: versions differ -> m | |||
89 | updating: f2 2/2 files (100.00%) |
|
89 | updating: f2 2/2 files (100.00%) | |
90 | picked tool 'internal:dump' for f2 (binary False symlink False) |
|
90 | picked tool 'internal:dump' for f2 (binary False symlink False) | |
91 | merging f2 |
|
91 | merging f2 | |
@@ -143,8 +143,8 b' Redo merge with merge.preferancestor="*"' | |||||
143 | resolving manifests |
|
143 | resolving manifests | |
144 | branchmerge: True, force: False, partial: False |
|
144 | branchmerge: True, force: False, partial: False | |
145 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
|
145 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 | |
|
146 | f2: keep -> k | |||
146 | f1: versions differ -> m |
|
147 | f1: versions differ -> m | |
147 | f2: keep -> k |
|
|||
148 |
|
148 | |||
149 | auction for merging merge bids |
|
149 | auction for merging merge bids | |
150 | f1: picking 'get' action |
|
150 | f1: picking 'get' action | |
@@ -152,9 +152,9 b' Redo merge with merge.preferancestor="*"' | |||||
152 | end of auction |
|
152 | end of auction | |
153 |
|
153 | |||
154 | f1: remote is newer -> g |
|
154 | f1: remote is newer -> g | |
155 | f2: keep -> k |
|
|||
156 | getting f1 |
|
155 | getting f1 | |
157 | updating: f1 1/1 files (100.00%) |
|
156 | updating: f1 1/1 files (100.00%) | |
|
157 | f2: keep -> k | |||
158 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
158 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
159 | (branch merge, don't forget to commit) |
|
159 | (branch merge, don't forget to commit) | |
160 |
|
160 | |||
@@ -188,8 +188,8 b' The other way around:' | |||||
188 | resolving manifests |
|
188 | resolving manifests | |
189 | branchmerge: True, force: False, partial: False |
|
189 | branchmerge: True, force: False, partial: False | |
190 | ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 |
|
190 | ancestor: 40663881a6dd, local: adfe50279922+, remote: 3b08d01b0ab5 | |
|
191 | f2: remote is newer -> g | |||
191 | f1: versions differ -> m |
|
192 | f1: versions differ -> m | |
192 | f2: remote is newer -> g |
|
|||
193 |
|
193 | |||
194 | auction for merging merge bids |
|
194 | auction for merging merge bids | |
195 | f1: picking 'keep' action |
|
195 | f1: picking 'keep' action | |
@@ -197,9 +197,9 b' The other way around:' | |||||
197 | end of auction |
|
197 | end of auction | |
198 |
|
198 | |||
199 | f2: remote is newer -> g |
|
199 | f2: remote is newer -> g | |
200 | f1: keep -> k |
|
|||
201 | getting f2 |
|
200 | getting f2 | |
202 | updating: f2 1/1 files (100.00%) |
|
201 | updating: f2 1/1 files (100.00%) | |
|
202 | f1: keep -> k | |||
203 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
203 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
204 | (branch merge, don't forget to commit) |
|
204 | (branch merge, don't forget to commit) | |
205 |
|
205 | |||
@@ -254,8 +254,8 b' Verify how the output looks and and how ' | |||||
254 | resolving manifests |
|
254 | resolving manifests | |
255 | branchmerge: True, force: False, partial: False |
|
255 | branchmerge: True, force: False, partial: False | |
256 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 |
|
256 | ancestor: 40663881a6dd, local: 3b08d01b0ab5+, remote: adfe50279922 | |
|
257 | f2: keep -> k | |||
257 | f1: versions differ -> m |
|
258 | f1: versions differ -> m | |
258 | f2: keep -> k |
|
|||
259 |
|
259 | |||
260 | auction for merging merge bids |
|
260 | auction for merging merge bids | |
261 | f1: picking 'get' action |
|
261 | f1: picking 'get' action | |
@@ -263,9 +263,9 b' Verify how the output looks and and how ' | |||||
263 | end of auction |
|
263 | end of auction | |
264 |
|
264 | |||
265 | f1: remote is newer -> g |
|
265 | f1: remote is newer -> g | |
266 | f2: keep -> k |
|
|||
267 | getting f1 |
|
266 | getting f1 | |
268 | updating: f1 1/1 files (100.00%) |
|
267 | updating: f1 1/1 files (100.00%) | |
|
268 | f2: keep -> k | |||
269 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
269 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
270 | (branch merge, don't forget to commit) |
|
270 | (branch merge, don't forget to commit) | |
271 |
|
271 |
@@ -34,8 +34,8 b' Symlink is local parent, executable is o' | |||||
34 | resolving manifests |
|
34 | resolving manifests | |
35 | branchmerge: True, force: False, partial: False |
|
35 | branchmerge: True, force: False, partial: False | |
36 | ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
|
36 | ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c | |
|
37 | preserving a for resolve of a | |||
37 | a: versions differ -> m |
|
38 | a: versions differ -> m | |
38 | preserving a for resolve of a |
|
|||
39 | updating: a 1/1 files (100.00%) |
|
39 | updating: a 1/1 files (100.00%) | |
40 | picked tool 'internal:merge' for a (binary False symlink True) |
|
40 | picked tool 'internal:merge' for a (binary False symlink True) | |
41 | merging a |
|
41 | merging a | |
@@ -68,8 +68,8 b' Symlink is other parent, executable is l' | |||||
68 | resolving manifests |
|
68 | resolving manifests | |
69 | branchmerge: True, force: False, partial: False |
|
69 | branchmerge: True, force: False, partial: False | |
70 | ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
|
70 | ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | |
|
71 | preserving a for resolve of a | |||
71 | a: versions differ -> m |
|
72 | a: versions differ -> m | |
72 | preserving a for resolve of a |
|
|||
73 | updating: a 1/1 files (100.00%) |
|
73 | updating: a 1/1 files (100.00%) | |
74 | picked tool 'internal:merge' for a (binary False symlink True) |
|
74 | picked tool 'internal:merge' for a (binary False symlink True) | |
75 | merging a |
|
75 | merging a | |
@@ -102,8 +102,8 b' Update to link with local change should ' | |||||
102 | resolving manifests |
|
102 | resolving manifests | |
103 | branchmerge: False, force: False, partial: False |
|
103 | branchmerge: False, force: False, partial: False | |
104 | ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
|
104 | ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f | |
|
105 | preserving a for resolve of a | |||
105 | a: versions differ -> m |
|
106 | a: versions differ -> m | |
106 | preserving a for resolve of a |
|
|||
107 | updating: a 1/1 files (100.00%) |
|
107 | updating: a 1/1 files (100.00%) | |
108 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
|
108 | (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) | |
109 | picked tool 'internal:prompt' for a (binary False symlink True) |
|
109 | picked tool 'internal:prompt' for a (binary False symlink True) |
@@ -84,8 +84,8 b' pull and merge from test-a again' | |||||
84 | resolving manifests |
|
84 | resolving manifests | |
85 | branchmerge: True, force: False, partial: False |
|
85 | branchmerge: True, force: False, partial: False | |
86 | ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 |
|
86 | ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 | |
|
87 | preserving test.txt for resolve of test.txt | |||
87 | test.txt: versions differ -> m |
|
88 | test.txt: versions differ -> m | |
88 | preserving test.txt for resolve of test.txt |
|
|||
89 | updating: test.txt 1/1 files (100.00%) |
|
89 | updating: test.txt 1/1 files (100.00%) | |
90 | picked tool 'internal:merge' for test.txt (binary False symlink False) |
|
90 | picked tool 'internal:merge' for test.txt (binary False symlink False) | |
91 | merging test.txt |
|
91 | merging test.txt |
@@ -220,9 +220,9 b' Check that the right ancestors is used w' | |||||
220 | branchmerge: False, force: True, partial: False |
|
220 | branchmerge: False, force: True, partial: False | |
221 | ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
|
221 | ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b | |
222 | f2.txt: other deleted -> r |
|
222 | f2.txt: other deleted -> r | |
223 | f1.txt: remote created -> g |
|
|||
224 | removing f2.txt |
|
223 | removing f2.txt | |
225 | updating: f2.txt 1/2 files (50.00%) |
|
224 | updating: f2.txt 1/2 files (50.00%) | |
|
225 | f1.txt: remote created -> g | |||
226 | getting f1.txt |
|
226 | getting f1.txt | |
227 | updating: f1.txt 2/2 files (100.00%) |
|
227 | updating: f1.txt 2/2 files (100.00%) | |
228 | merge against 9:e31216eec445 |
|
228 | merge against 9:e31216eec445 | |
@@ -255,9 +255,9 b' Check that the right ancestors is used w' | |||||
255 | branchmerge: False, force: False, partial: False |
|
255 | branchmerge: False, force: False, partial: False | |
256 | ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
|
256 | ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 | |
257 | f1.txt: other deleted -> r |
|
257 | f1.txt: other deleted -> r | |
258 | f2.txt: remote created -> g |
|
|||
259 | removing f1.txt |
|
258 | removing f1.txt | |
260 | updating: f1.txt 1/2 files (50.00%) |
|
259 | updating: f1.txt 1/2 files (50.00%) | |
|
260 | f2.txt: remote created -> g | |||
261 | getting f2.txt |
|
261 | getting f2.txt | |
262 | updating: f2.txt 2/2 files (100.00%) |
|
262 | updating: f2.txt 2/2 files (100.00%) | |
263 | 3 changesets found |
|
263 | 3 changesets found |
@@ -40,16 +40,16 b'' | |||||
40 | branchmerge: True, force: False, partial: False |
|
40 | branchmerge: True, force: False, partial: False | |
41 | ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
|
41 | ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 | |
42 | a/a: other deleted -> r |
|
42 | a/a: other deleted -> r | |
|
43 | removing a/a | |||
43 | a/b: other deleted -> r |
|
44 | a/b: other deleted -> r | |
44 | b/a: remote created -> g |
|
|||
45 | b/b: remote created -> g |
|
|||
46 | b/c: remote directory rename - move from a/c -> dm |
|
|||
47 | removing a/a |
|
|||
48 | removing a/b |
|
45 | removing a/b | |
49 | updating: a/b 2/5 files (40.00%) |
|
46 | updating: a/b 2/5 files (40.00%) | |
|
47 | b/a: remote created -> g | |||
50 | getting b/a |
|
48 | getting b/a | |
|
49 | b/b: remote created -> g | |||
51 | getting b/b |
|
50 | getting b/b | |
52 | updating: b/b 4/5 files (80.00%) |
|
51 | updating: b/b 4/5 files (80.00%) | |
|
52 | b/c: remote directory rename - move from a/c -> dm | |||
53 | updating: b/c 5/5 files (100.00%) |
|
53 | updating: b/c 5/5 files (100.00%) | |
54 | moving a/c to b/c (glob) |
|
54 | moving a/c to b/c (glob) | |
55 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
55 | 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
@@ -36,18 +36,18 b'' | |||||
36 | resolving manifests |
|
36 | resolving manifests | |
37 | branchmerge: True, force: False, partial: False |
|
37 | branchmerge: True, force: False, partial: False | |
38 | ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c |
|
38 | ancestor: af1939970a1c, local: 044f8520aeeb+, remote: 85c198ef2f6c | |
|
39 | preserving a for resolve of b | |||
|
40 | removing a | |||
39 | b2: remote created -> g |
|
41 | b2: remote created -> g | |
40 | b: remote moved from a -> m |
|
|||
41 | preserving a for resolve of b |
|
|||
42 | a2: divergent renames -> dr |
|
|||
43 | removing a |
|
|||
44 | getting b2 |
|
42 | getting b2 | |
45 | updating: b2 1/3 files (33.33%) |
|
43 | updating: b2 1/3 files (33.33%) | |
|
44 | b: remote moved from a -> m | |||
46 | updating: b 2/3 files (66.67%) |
|
45 | updating: b 2/3 files (66.67%) | |
47 | picked tool 'internal:merge' for b (binary False symlink False) |
|
46 | picked tool 'internal:merge' for b (binary False symlink False) | |
48 | merging a and b to b |
|
47 | merging a and b to b | |
49 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c |
|
48 | my b@044f8520aeeb+ other b@85c198ef2f6c ancestor a@af1939970a1c | |
50 | premerge successful |
|
49 | premerge successful | |
|
50 | a2: divergent renames -> dr | |||
51 | updating: a2 3/3 files (100.00%) |
|
51 | updating: a2 3/3 files (100.00%) | |
52 | note: possible conflict - a2 was renamed multiple times to: |
|
52 | note: possible conflict - a2 was renamed multiple times to: | |
53 | c2 |
|
53 | c2 | |
@@ -182,9 +182,9 b' Check for issue3074' | |||||
182 | branchmerge: True, force: False, partial: False |
|
182 | branchmerge: True, force: False, partial: False | |
183 | ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 |
|
183 | ancestor: 19d7f95df299, local: 0084274f6b67+, remote: 5d32493049f0 | |
184 | newfile: remote created -> g |
|
184 | newfile: remote created -> g | |
185 | file: rename and delete -> rd |
|
|||
186 | getting newfile |
|
185 | getting newfile | |
187 | updating: newfile 1/2 files (50.00%) |
|
186 | updating: newfile 1/2 files (50.00%) | |
|
187 | file: rename and delete -> rd | |||
188 | updating: file 2/2 files (100.00%) |
|
188 | updating: file 2/2 files (100.00%) | |
189 | note: possible conflict - file was deleted and renamed to: |
|
189 | note: possible conflict - file was deleted and renamed to: | |
190 | newfile |
|
190 | newfile |
@@ -86,16 +86,16 b' args:' | |||||
86 | resolving manifests |
|
86 | resolving manifests | |
87 | branchmerge: True, force: False, partial: False |
|
87 | branchmerge: True, force: False, partial: False | |
88 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
|
88 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 | |
|
89 | preserving a for resolve of b | |||
|
90 | preserving rev for resolve of rev | |||
89 | a: keep -> k |
|
91 | a: keep -> k | |
90 | b: remote copied from a -> m |
|
92 | b: remote copied from a -> m | |
91 | preserving a for resolve of b |
|
|||
92 | rev: versions differ -> m |
|
|||
93 | preserving rev for resolve of rev |
|
|||
94 | updating: b 1/2 files (50.00%) |
|
93 | updating: b 1/2 files (50.00%) | |
95 | picked tool 'python ../merge' for b (binary False symlink False) |
|
94 | picked tool 'python ../merge' for b (binary False symlink False) | |
96 | merging a and b to b |
|
95 | merging a and b to b | |
97 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
|
96 | my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 | |
98 | premerge successful |
|
97 | premerge successful | |
|
98 | rev: versions differ -> m | |||
99 | updating: rev 2/2 files (100.00%) |
|
99 | updating: rev 2/2 files (100.00%) | |
100 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
100 | picked tool 'python ../merge' for rev (binary False symlink False) | |
101 | merging rev |
|
101 | merging rev | |
@@ -122,18 +122,18 b' args:' | |||||
122 | resolving manifests |
|
122 | resolving manifests | |
123 | branchmerge: True, force: False, partial: False |
|
123 | branchmerge: True, force: False, partial: False | |
124 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
|
124 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 | |
|
125 | preserving b for resolve of b | |||
|
126 | preserving rev for resolve of rev | |||
125 | a: remote is newer -> g |
|
127 | a: remote is newer -> g | |
126 | b: local copied/moved from a -> m |
|
|||
127 | preserving b for resolve of b |
|
|||
128 | rev: versions differ -> m |
|
|||
129 | preserving rev for resolve of rev |
|
|||
130 | getting a |
|
128 | getting a | |
131 | updating: a 1/3 files (33.33%) |
|
129 | updating: a 1/3 files (33.33%) | |
|
130 | b: local copied/moved from a -> m | |||
132 | updating: b 2/3 files (66.67%) |
|
131 | updating: b 2/3 files (66.67%) | |
133 | picked tool 'python ../merge' for b (binary False symlink False) |
|
132 | picked tool 'python ../merge' for b (binary False symlink False) | |
134 | merging b and a to b |
|
133 | merging b and a to b | |
135 | my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
134 | my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 | |
136 | premerge successful |
|
135 | premerge successful | |
|
136 | rev: versions differ -> m | |||
137 | updating: rev 3/3 files (100.00%) |
|
137 | updating: rev 3/3 files (100.00%) | |
138 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
138 | picked tool 'python ../merge' for rev (binary False symlink False) | |
139 | merging rev |
|
139 | merging rev | |
@@ -160,16 +160,16 b' args:' | |||||
160 | resolving manifests |
|
160 | resolving manifests | |
161 | branchmerge: True, force: False, partial: False |
|
161 | branchmerge: True, force: False, partial: False | |
162 | ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
|
162 | ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a | |
|
163 | preserving a for resolve of b | |||
|
164 | preserving rev for resolve of rev | |||
|
165 | removing a | |||
163 | b: remote moved from a -> m |
|
166 | b: remote moved from a -> m | |
164 | preserving a for resolve of b |
|
|||
165 | rev: versions differ -> m |
|
|||
166 | preserving rev for resolve of rev |
|
|||
167 | removing a |
|
|||
168 | updating: b 1/2 files (50.00%) |
|
167 | updating: b 1/2 files (50.00%) | |
169 | picked tool 'python ../merge' for b (binary False symlink False) |
|
168 | picked tool 'python ../merge' for b (binary False symlink False) | |
170 | merging a and b to b |
|
169 | merging a and b to b | |
171 | my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
|
170 | my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 | |
172 | premerge successful |
|
171 | premerge successful | |
|
172 | rev: versions differ -> m | |||
173 | updating: rev 2/2 files (100.00%) |
|
173 | updating: rev 2/2 files (100.00%) | |
174 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
174 | picked tool 'python ../merge' for rev (binary False symlink False) | |
175 | merging rev |
|
175 | merging rev | |
@@ -195,15 +195,15 b' args:' | |||||
195 | resolving manifests |
|
195 | resolving manifests | |
196 | branchmerge: True, force: False, partial: False |
|
196 | branchmerge: True, force: False, partial: False | |
197 | ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
|
197 | ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 | |
|
198 | preserving b for resolve of b | |||
|
199 | preserving rev for resolve of rev | |||
198 | b: local copied/moved from a -> m |
|
200 | b: local copied/moved from a -> m | |
199 | preserving b for resolve of b |
|
|||
200 | rev: versions differ -> m |
|
|||
201 | preserving rev for resolve of rev |
|
|||
202 | updating: b 1/2 files (50.00%) |
|
201 | updating: b 1/2 files (50.00%) | |
203 | picked tool 'python ../merge' for b (binary False symlink False) |
|
202 | picked tool 'python ../merge' for b (binary False symlink False) | |
204 | merging b and a to b |
|
203 | merging b and a to b | |
205 | my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
204 | my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 | |
206 | premerge successful |
|
205 | premerge successful | |
|
206 | rev: versions differ -> m | |||
207 | updating: rev 2/2 files (100.00%) |
|
207 | updating: rev 2/2 files (100.00%) | |
208 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
208 | picked tool 'python ../merge' for rev (binary False symlink False) | |
209 | merging rev |
|
209 | merging rev | |
@@ -229,11 +229,11 b' args:' | |||||
229 | resolving manifests |
|
229 | resolving manifests | |
230 | branchmerge: True, force: False, partial: False |
|
230 | branchmerge: True, force: False, partial: False | |
231 | ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
|
231 | ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 | |
|
232 | preserving rev for resolve of rev | |||
232 | b: remote created -> g |
|
233 | b: remote created -> g | |
233 | rev: versions differ -> m |
|
|||
234 | preserving rev for resolve of rev |
|
|||
235 | getting b |
|
234 | getting b | |
236 | updating: b 1/2 files (50.00%) |
|
235 | updating: b 1/2 files (50.00%) | |
|
236 | rev: versions differ -> m | |||
237 | updating: rev 2/2 files (100.00%) |
|
237 | updating: rev 2/2 files (100.00%) | |
238 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
238 | picked tool 'python ../merge' for rev (binary False symlink False) | |
239 | merging rev |
|
239 | merging rev | |
@@ -259,8 +259,8 b' args:' | |||||
259 | resolving manifests |
|
259 | resolving manifests | |
260 | branchmerge: True, force: False, partial: False |
|
260 | branchmerge: True, force: False, partial: False | |
261 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
|
261 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 | |
|
262 | preserving rev for resolve of rev | |||
262 | rev: versions differ -> m |
|
263 | rev: versions differ -> m | |
263 | preserving rev for resolve of rev |
|
|||
264 | updating: rev 1/1 files (100.00%) |
|
264 | updating: rev 1/1 files (100.00%) | |
265 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
265 | picked tool 'python ../merge' for rev (binary False symlink False) | |
266 | merging rev |
|
266 | merging rev | |
@@ -286,14 +286,14 b' args:' | |||||
286 | resolving manifests |
|
286 | resolving manifests | |
287 | branchmerge: True, force: False, partial: False |
|
287 | branchmerge: True, force: False, partial: False | |
288 | ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a |
|
288 | ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a | |
|
289 | preserving rev for resolve of rev | |||
289 | a: other deleted -> r |
|
290 | a: other deleted -> r | |
290 | b: remote created -> g |
|
|||
291 | rev: versions differ -> m |
|
|||
292 | preserving rev for resolve of rev |
|
|||
293 | removing a |
|
291 | removing a | |
294 | updating: a 1/3 files (33.33%) |
|
292 | updating: a 1/3 files (33.33%) | |
|
293 | b: remote created -> g | |||
295 | getting b |
|
294 | getting b | |
296 | updating: b 2/3 files (66.67%) |
|
295 | updating: b 2/3 files (66.67%) | |
|
296 | rev: versions differ -> m | |||
297 | updating: rev 3/3 files (100.00%) |
|
297 | updating: rev 3/3 files (100.00%) | |
298 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
298 | picked tool 'python ../merge' for rev (binary False symlink False) | |
299 | merging rev |
|
299 | merging rev | |
@@ -318,8 +318,8 b' args:' | |||||
318 | resolving manifests |
|
318 | resolving manifests | |
319 | branchmerge: True, force: False, partial: False |
|
319 | branchmerge: True, force: False, partial: False | |
320 | ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
|
320 | ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 | |
|
321 | preserving rev for resolve of rev | |||
321 | rev: versions differ -> m |
|
322 | rev: versions differ -> m | |
322 | preserving rev for resolve of rev |
|
|||
323 | updating: rev 1/1 files (100.00%) |
|
323 | updating: rev 1/1 files (100.00%) | |
324 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
324 | picked tool 'python ../merge' for rev (binary False symlink False) | |
325 | merging rev |
|
325 | merging rev | |
@@ -341,14 +341,14 b' args:' | |||||
341 | resolving manifests |
|
341 | resolving manifests | |
342 | branchmerge: True, force: False, partial: False |
|
342 | branchmerge: True, force: False, partial: False | |
343 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
|
343 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 | |
|
344 | preserving b for resolve of b | |||
|
345 | preserving rev for resolve of rev | |||
344 | b: versions differ -> m |
|
346 | b: versions differ -> m | |
345 | preserving b for resolve of b |
|
|||
346 | rev: versions differ -> m |
|
|||
347 | preserving rev for resolve of rev |
|
|||
348 | updating: b 1/2 files (50.00%) |
|
347 | updating: b 1/2 files (50.00%) | |
349 | picked tool 'python ../merge' for b (binary False symlink False) |
|
348 | picked tool 'python ../merge' for b (binary False symlink False) | |
350 | merging b |
|
349 | merging b | |
351 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 |
|
350 | my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337 | |
|
351 | rev: versions differ -> m | |||
352 | updating: rev 2/2 files (100.00%) |
|
352 | updating: rev 2/2 files (100.00%) | |
353 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
353 | picked tool 'python ../merge' for rev (binary False symlink False) | |
354 | merging rev |
|
354 | merging rev | |
@@ -379,16 +379,16 b' m "um a c" "um x c" " " "10 do merg' | |||||
379 | resolving manifests |
|
379 | resolving manifests | |
380 | branchmerge: True, force: False, partial: False |
|
380 | branchmerge: True, force: False, partial: False | |
381 | ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e |
|
381 | ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e | |
|
382 | preserving rev for resolve of rev | |||
382 | c: remote created -> g |
|
383 | c: remote created -> g | |
383 | rev: versions differ -> m |
|
|||
384 | preserving rev for resolve of rev |
|
|||
385 | a: divergent renames -> dr |
|
|||
386 | getting c |
|
384 | getting c | |
387 | updating: c 1/3 files (33.33%) |
|
385 | updating: c 1/3 files (33.33%) | |
|
386 | rev: versions differ -> m | |||
388 | updating: rev 2/3 files (66.67%) |
|
387 | updating: rev 2/3 files (66.67%) | |
389 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
388 | picked tool 'python ../merge' for rev (binary False symlink False) | |
390 | merging rev |
|
389 | merging rev | |
391 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 |
|
390 | my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337 | |
|
391 | a: divergent renames -> dr | |||
392 | updating: a 3/3 files (100.00%) |
|
392 | updating: a 3/3 files (100.00%) | |
393 | note: possible conflict - a was renamed multiple times to: |
|
393 | note: possible conflict - a was renamed multiple times to: | |
394 | b |
|
394 | b | |
@@ -411,14 +411,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
411 | resolving manifests |
|
411 | resolving manifests | |
412 | branchmerge: True, force: False, partial: False |
|
412 | branchmerge: True, force: False, partial: False | |
413 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
|
413 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 | |
|
414 | preserving b for resolve of b | |||
|
415 | preserving rev for resolve of rev | |||
414 | b: versions differ -> m |
|
416 | b: versions differ -> m | |
415 | preserving b for resolve of b |
|
|||
416 | rev: versions differ -> m |
|
|||
417 | preserving rev for resolve of rev |
|
|||
418 | updating: b 1/2 files (50.00%) |
|
417 | updating: b 1/2 files (50.00%) | |
419 | picked tool 'python ../merge' for b (binary False symlink False) |
|
418 | picked tool 'python ../merge' for b (binary False symlink False) | |
420 | merging b |
|
419 | merging b | |
421 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 |
|
420 | my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000 | |
|
421 | rev: versions differ -> m | |||
422 | updating: rev 2/2 files (100.00%) |
|
422 | updating: rev 2/2 files (100.00%) | |
423 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
423 | picked tool 'python ../merge' for rev (binary False symlink False) | |
424 | merging rev |
|
424 | merging rev | |
@@ -441,17 +441,17 b' m "um a c" "um x c" " " "10 do merg' | |||||
441 | resolving manifests |
|
441 | resolving manifests | |
442 | branchmerge: True, force: False, partial: False |
|
442 | branchmerge: True, force: False, partial: False | |
443 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
|
443 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | |
|
444 | preserving b for resolve of b | |||
|
445 | preserving rev for resolve of rev | |||
444 | a: other deleted -> r |
|
446 | a: other deleted -> r | |
445 | b: versions differ -> m |
|
|||
446 | preserving b for resolve of b |
|
|||
447 | rev: versions differ -> m |
|
|||
448 | preserving rev for resolve of rev |
|
|||
449 | removing a |
|
447 | removing a | |
450 | updating: a 1/3 files (33.33%) |
|
448 | updating: a 1/3 files (33.33%) | |
|
449 | b: versions differ -> m | |||
451 | updating: b 2/3 files (66.67%) |
|
450 | updating: b 2/3 files (66.67%) | |
452 | picked tool 'python ../merge' for b (binary False symlink False) |
|
451 | picked tool 'python ../merge' for b (binary False symlink False) | |
453 | merging b |
|
452 | merging b | |
454 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
453 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
|
454 | rev: versions differ -> m | |||
455 | updating: rev 3/3 files (100.00%) |
|
455 | updating: rev 3/3 files (100.00%) | |
456 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
456 | picked tool 'python ../merge' for rev (binary False symlink False) | |
457 | merging rev |
|
457 | merging rev | |
@@ -473,17 +473,17 b' m "um a c" "um x c" " " "10 do merg' | |||||
473 | resolving manifests |
|
473 | resolving manifests | |
474 | branchmerge: True, force: False, partial: False |
|
474 | branchmerge: True, force: False, partial: False | |
475 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
|
475 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a | |
|
476 | preserving b for resolve of b | |||
|
477 | preserving rev for resolve of rev | |||
476 | a: remote is newer -> g |
|
478 | a: remote is newer -> g | |
477 | b: versions differ -> m |
|
|||
478 | preserving b for resolve of b |
|
|||
479 | rev: versions differ -> m |
|
|||
480 | preserving rev for resolve of rev |
|
|||
481 | getting a |
|
479 | getting a | |
482 | updating: a 1/3 files (33.33%) |
|
480 | updating: a 1/3 files (33.33%) | |
|
481 | b: versions differ -> m | |||
483 | updating: b 2/3 files (66.67%) |
|
482 | updating: b 2/3 files (66.67%) | |
484 | picked tool 'python ../merge' for b (binary False symlink False) |
|
483 | picked tool 'python ../merge' for b (binary False symlink False) | |
485 | merging b |
|
484 | merging b | |
486 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
485 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
|
486 | rev: versions differ -> m | |||
487 | updating: rev 3/3 files (100.00%) |
|
487 | updating: rev 3/3 files (100.00%) | |
488 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
488 | picked tool 'python ../merge' for rev (binary False symlink False) | |
489 | merging rev |
|
489 | merging rev | |
@@ -506,17 +506,17 b' m "um a c" "um x c" " " "10 do merg' | |||||
506 | resolving manifests |
|
506 | resolving manifests | |
507 | branchmerge: True, force: False, partial: False |
|
507 | branchmerge: True, force: False, partial: False | |
508 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
|
508 | ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a | |
|
509 | preserving b for resolve of b | |||
|
510 | preserving rev for resolve of rev | |||
509 | a: other deleted -> r |
|
511 | a: other deleted -> r | |
510 | b: versions differ -> m |
|
|||
511 | preserving b for resolve of b |
|
|||
512 | rev: versions differ -> m |
|
|||
513 | preserving rev for resolve of rev |
|
|||
514 | removing a |
|
512 | removing a | |
515 | updating: a 1/3 files (33.33%) |
|
513 | updating: a 1/3 files (33.33%) | |
|
514 | b: versions differ -> m | |||
516 | updating: b 2/3 files (66.67%) |
|
515 | updating: b 2/3 files (66.67%) | |
517 | picked tool 'python ../merge' for b (binary False symlink False) |
|
516 | picked tool 'python ../merge' for b (binary False symlink False) | |
518 | merging b |
|
517 | merging b | |
519 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 |
|
518 | my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000 | |
|
519 | rev: versions differ -> m | |||
520 | updating: rev 3/3 files (100.00%) |
|
520 | updating: rev 3/3 files (100.00%) | |
521 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
521 | picked tool 'python ../merge' for rev (binary False symlink False) | |
522 | merging rev |
|
522 | merging rev | |
@@ -538,17 +538,17 b' m "um a c" "um x c" " " "10 do merg' | |||||
538 | resolving manifests |
|
538 | resolving manifests | |
539 | branchmerge: True, force: False, partial: False |
|
539 | branchmerge: True, force: False, partial: False | |
540 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
|
540 | ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a | |
|
541 | preserving b for resolve of b | |||
|
542 | preserving rev for resolve of rev | |||
541 | a: remote is newer -> g |
|
543 | a: remote is newer -> g | |
542 | b: versions differ -> m |
|
|||
543 | preserving b for resolve of b |
|
|||
544 | rev: versions differ -> m |
|
|||
545 | preserving rev for resolve of rev |
|
|||
546 | getting a |
|
544 | getting a | |
547 | updating: a 1/3 files (33.33%) |
|
545 | updating: a 1/3 files (33.33%) | |
|
546 | b: versions differ -> m | |||
548 | updating: b 2/3 files (66.67%) |
|
547 | updating: b 2/3 files (66.67%) | |
549 | picked tool 'python ../merge' for b (binary False symlink False) |
|
548 | picked tool 'python ../merge' for b (binary False symlink False) | |
550 | merging b |
|
549 | merging b | |
551 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 |
|
550 | my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000 | |
|
551 | rev: versions differ -> m | |||
552 | updating: rev 3/3 files (100.00%) |
|
552 | updating: rev 3/3 files (100.00%) | |
553 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
553 | picked tool 'python ../merge' for rev (binary False symlink False) | |
554 | merging rev |
|
554 | merging rev | |
@@ -571,15 +571,15 b' m "um a c" "um x c" " " "10 do merg' | |||||
571 | resolving manifests |
|
571 | resolving manifests | |
572 | branchmerge: True, force: False, partial: False |
|
572 | branchmerge: True, force: False, partial: False | |
573 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
|
573 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 | |
|
574 | preserving b for resolve of b | |||
|
575 | preserving rev for resolve of rev | |||
574 | a: keep -> k |
|
576 | a: keep -> k | |
575 | b: versions differ -> m |
|
577 | b: versions differ -> m | |
576 | preserving b for resolve of b |
|
|||
577 | rev: versions differ -> m |
|
|||
578 | preserving rev for resolve of rev |
|
|||
579 | updating: b 1/2 files (50.00%) |
|
578 | updating: b 1/2 files (50.00%) | |
580 | picked tool 'python ../merge' for b (binary False symlink False) |
|
579 | picked tool 'python ../merge' for b (binary False symlink False) | |
581 | merging b |
|
580 | merging b | |
582 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 |
|
581 | my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000 | |
|
582 | rev: versions differ -> m | |||
583 | updating: rev 2/2 files (100.00%) |
|
583 | updating: rev 2/2 files (100.00%) | |
584 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
584 | picked tool 'python ../merge' for rev (binary False symlink False) | |
585 | merging rev |
|
585 | merging rev | |
@@ -604,17 +604,17 b' m "um a c" "um x c" " " "10 do merg' | |||||
604 | ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
|
604 | ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a | |
605 | remote changed a which local deleted |
|
605 | remote changed a which local deleted | |
606 | use (c)hanged version or leave (d)eleted? c |
|
606 | use (c)hanged version or leave (d)eleted? c | |
|
607 | preserving b for resolve of b | |||
|
608 | preserving rev for resolve of rev | |||
607 | a: prompt recreating -> g |
|
609 | a: prompt recreating -> g | |
608 | b: versions differ -> m |
|
|||
609 | preserving b for resolve of b |
|
|||
610 | rev: versions differ -> m |
|
|||
611 | preserving rev for resolve of rev |
|
|||
612 | getting a |
|
610 | getting a | |
613 | updating: a 1/3 files (33.33%) |
|
611 | updating: a 1/3 files (33.33%) | |
|
612 | b: versions differ -> m | |||
614 | updating: b 2/3 files (66.67%) |
|
613 | updating: b 2/3 files (66.67%) | |
615 | picked tool 'python ../merge' for b (binary False symlink False) |
|
614 | picked tool 'python ../merge' for b (binary False symlink False) | |
616 | merging b |
|
615 | merging b | |
617 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 |
|
616 | my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000 | |
|
617 | rev: versions differ -> m | |||
618 | updating: rev 3/3 files (100.00%) |
|
618 | updating: rev 3/3 files (100.00%) | |
619 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
619 | picked tool 'python ../merge' for rev (binary False symlink False) | |
620 | merging rev |
|
620 | merging rev | |
@@ -639,16 +639,16 b' m "um a c" "um x c" " " "10 do merg' | |||||
639 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
|
639 | ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a | |
640 | local changed a which remote deleted |
|
640 | local changed a which remote deleted | |
641 | use (c)hanged version or (d)elete? c |
|
641 | use (c)hanged version or (d)elete? c | |
|
642 | preserving b for resolve of b | |||
|
643 | preserving rev for resolve of rev | |||
642 | a: prompt keep -> a |
|
644 | a: prompt keep -> a | |
|
645 | updating: a 1/3 files (33.33%) | |||
643 | b: versions differ -> m |
|
646 | b: versions differ -> m | |
644 | preserving b for resolve of b |
|
|||
645 | rev: versions differ -> m |
|
|||
646 | preserving rev for resolve of rev |
|
|||
647 | updating: a 1/3 files (33.33%) |
|
|||
648 | updating: b 2/3 files (66.67%) |
|
647 | updating: b 2/3 files (66.67%) | |
649 | picked tool 'python ../merge' for b (binary False symlink False) |
|
648 | picked tool 'python ../merge' for b (binary False symlink False) | |
650 | merging b |
|
649 | merging b | |
651 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 |
|
650 | my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000 | |
|
651 | rev: versions differ -> m | |||
652 | updating: rev 3/3 files (100.00%) |
|
652 | updating: rev 3/3 files (100.00%) | |
653 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
653 | picked tool 'python ../merge' for rev (binary False symlink False) | |
654 | merging rev |
|
654 | merging rev | |
@@ -674,15 +674,15 b' m "um a c" "um x c" " " "10 do merg' | |||||
674 | resolving manifests |
|
674 | resolving manifests | |
675 | branchmerge: True, force: False, partial: False |
|
675 | branchmerge: True, force: False, partial: False | |
676 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
|
676 | ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 | |
|
677 | preserving a for resolve of b | |||
|
678 | preserving rev for resolve of rev | |||
|
679 | removing a | |||
677 | b: remote moved from a -> m |
|
680 | b: remote moved from a -> m | |
678 | preserving a for resolve of b |
|
|||
679 | rev: versions differ -> m |
|
|||
680 | preserving rev for resolve of rev |
|
|||
681 | removing a |
|
|||
682 | updating: b 1/2 files (50.00%) |
|
681 | updating: b 1/2 files (50.00%) | |
683 | picked tool 'python ../merge' for b (binary False symlink False) |
|
682 | picked tool 'python ../merge' for b (binary False symlink False) | |
684 | merging a and b to b |
|
683 | merging a and b to b | |
685 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 |
|
684 | my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337 | |
|
685 | rev: versions differ -> m | |||
686 | updating: rev 2/2 files (100.00%) |
|
686 | updating: rev 2/2 files (100.00%) | |
687 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
687 | picked tool 'python ../merge' for rev (binary False symlink False) | |
688 | merging rev |
|
688 | merging rev | |
@@ -708,14 +708,14 b' m "um a c" "um x c" " " "10 do merg' | |||||
708 | resolving manifests |
|
708 | resolving manifests | |
709 | branchmerge: True, force: False, partial: False |
|
709 | branchmerge: True, force: False, partial: False | |
710 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
|
710 | ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 | |
|
711 | preserving b for resolve of b | |||
|
712 | preserving rev for resolve of rev | |||
711 | b: local copied/moved from a -> m |
|
713 | b: local copied/moved from a -> m | |
712 | preserving b for resolve of b |
|
|||
713 | rev: versions differ -> m |
|
|||
714 | preserving rev for resolve of rev |
|
|||
715 | updating: b 1/2 files (50.00%) |
|
714 | updating: b 1/2 files (50.00%) | |
716 | picked tool 'python ../merge' for b (binary False symlink False) |
|
715 | picked tool 'python ../merge' for b (binary False symlink False) | |
717 | merging b and a to b |
|
716 | merging b and a to b | |
718 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 |
|
717 | my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337 | |
|
718 | rev: versions differ -> m | |||
719 | updating: rev 2/2 files (100.00%) |
|
719 | updating: rev 2/2 files (100.00%) | |
720 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
720 | picked tool 'python ../merge' for rev (binary False symlink False) | |
721 | merging rev |
|
721 | merging rev | |
@@ -746,18 +746,18 b' m "nm a b" "um x a" " " "22 get a, ' | |||||
746 | resolving manifests |
|
746 | resolving manifests | |
747 | branchmerge: True, force: False, partial: False |
|
747 | branchmerge: True, force: False, partial: False | |
748 | ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
|
748 | ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f | |
|
749 | preserving b for resolve of b | |||
|
750 | preserving rev for resolve of rev | |||
749 | c: remote created -> g |
|
751 | c: remote created -> g | |
750 | b: local copied/moved from a -> m |
|
|||
751 | preserving b for resolve of b |
|
|||
752 | rev: versions differ -> m |
|
|||
753 | preserving rev for resolve of rev |
|
|||
754 | getting c |
|
752 | getting c | |
755 | updating: c 1/3 files (33.33%) |
|
753 | updating: c 1/3 files (33.33%) | |
|
754 | b: local copied/moved from a -> m | |||
756 | updating: b 2/3 files (66.67%) |
|
755 | updating: b 2/3 files (66.67%) | |
757 | picked tool 'python ../merge' for b (binary False symlink False) |
|
756 | picked tool 'python ../merge' for b (binary False symlink False) | |
758 | merging b and a to b |
|
757 | merging b and a to b | |
759 | my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
|
758 | my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 | |
760 | premerge successful |
|
759 | premerge successful | |
|
760 | rev: versions differ -> m | |||
761 | updating: rev 3/3 files (100.00%) |
|
761 | updating: rev 3/3 files (100.00%) | |
762 | picked tool 'python ../merge' for rev (binary False symlink False) |
|
762 | picked tool 'python ../merge' for rev (binary False symlink False) | |
763 | merging rev |
|
763 | merging rev | |
@@ -836,28 +836,18 b' 8 f (f) f f "remote differs from ' | |||||
836 | ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898 |
|
836 | ancestor: e6cb3cf11019, local: ec44bf929ab5+, remote: c62e34d0b898 | |
837 | remote changed 8/f which local deleted |
|
837 | remote changed 8/f which local deleted | |
838 | use (c)hanged version or leave (d)eleted? c |
|
838 | use (c)hanged version or leave (d)eleted? c | |
|
839 | preserving 0/f for resolve of 0/f | |||
|
840 | preserving 1/g for resolve of 1/g | |||
|
841 | preserving 2/f for resolve of 2/f | |||
|
842 | preserving 3/f for resolve of 3/f | |||
|
843 | preserving 3/f for resolve of 3/g | |||
|
844 | preserving 4/f for resolve of 4/g | |||
|
845 | preserving 5/f for resolve of 5/f | |||
|
846 | preserving 5/g for resolve of 5/g | |||
|
847 | preserving 6/g for resolve of 6/g | |||
|
848 | preserving 7/f for resolve of 7/f | |||
|
849 | removing 4/f | |||
839 | 8/f: prompt recreating -> g |
|
850 | 8/f: prompt recreating -> g | |
840 | 0/f: versions differ -> m |
|
|||
841 | preserving 0/f for resolve of 0/f |
|
|||
842 | 1/g: versions differ -> m |
|
|||
843 | preserving 1/g for resolve of 1/g |
|
|||
844 | 2/f: versions differ -> m |
|
|||
845 | preserving 2/f for resolve of 2/f |
|
|||
846 | 3/f: versions differ -> m |
|
|||
847 | preserving 3/f for resolve of 3/f |
|
|||
848 | 3/g: remote copied from 3/f -> m |
|
|||
849 | preserving 3/f for resolve of 3/g |
|
|||
850 | 4/g: remote moved from 4/f -> m |
|
|||
851 | preserving 4/f for resolve of 4/g |
|
|||
852 | 5/f: versions differ -> m |
|
|||
853 | preserving 5/f for resolve of 5/f |
|
|||
854 | 5/g: local copied/moved from 5/f -> m |
|
|||
855 | preserving 5/g for resolve of 5/g |
|
|||
856 | 6/g: local copied/moved from 6/f -> m |
|
|||
857 | preserving 6/g for resolve of 6/g |
|
|||
858 | 7/f: remote differs from untracked local -> m |
|
|||
859 | preserving 7/f for resolve of 7/f |
|
|||
860 | removing 4/f |
|
|||
861 | getting 8/f |
|
851 | getting 8/f | |
862 | $ hg mani |
|
852 | $ hg mani | |
863 | 0/f |
|
853 | 0/f |
@@ -281,8 +281,8 b' merge tests' | |||||
281 | resolving manifests |
|
281 | resolving manifests | |
282 | branchmerge: True, force: False, partial: False |
|
282 | branchmerge: True, force: False, partial: False | |
283 | ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 |
|
283 | ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198 | |
|
284 | preserving t for resolve of t | |||
284 | t: versions differ -> m |
|
285 | t: versions differ -> m | |
285 | preserving t for resolve of t |
|
|||
286 | updating: t 1/1 files (100.00%) |
|
286 | updating: t 1/1 files (100.00%) | |
287 | picked tool 'internal:merge' for t (binary False symlink False) |
|
287 | picked tool 'internal:merge' for t (binary False symlink False) | |
288 | merging t |
|
288 | merging t |
@@ -46,11 +46,11 b'' | |||||
46 | resolving manifests |
|
46 | resolving manifests | |
47 | branchmerge: False, force: False, partial: False |
|
47 | branchmerge: False, force: False, partial: False | |
48 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
48 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | |
|
49 | preserving a for resolve of a | |||
49 | b: remote created -> g |
|
50 | b: remote created -> g | |
50 | a: versions differ -> m |
|
|||
51 | preserving a for resolve of a |
|
|||
52 | getting b |
|
51 | getting b | |
53 | updating: b 1/2 files (50.00%) |
|
52 | updating: b 1/2 files (50.00%) | |
|
53 | a: versions differ -> m | |||
54 | updating: a 2/2 files (100.00%) |
|
54 | updating: a 2/2 files (100.00%) | |
55 | picked tool 'true' for a (binary False symlink False) |
|
55 | picked tool 'true' for a (binary False symlink False) | |
56 | merging a |
|
56 | merging a | |
@@ -67,11 +67,11 b'' | |||||
67 | resolving manifests |
|
67 | resolving manifests | |
68 | branchmerge: False, force: False, partial: False |
|
68 | branchmerge: False, force: False, partial: False | |
69 | ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
|
69 | ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a | |
|
70 | preserving a for resolve of a | |||
70 | b: other deleted -> r |
|
71 | b: other deleted -> r | |
71 | a: versions differ -> m |
|
|||
72 | preserving a for resolve of a |
|
|||
73 | removing b |
|
72 | removing b | |
74 | updating: b 1/2 files (50.00%) |
|
73 | updating: b 1/2 files (50.00%) | |
|
74 | a: versions differ -> m | |||
75 | updating: a 2/2 files (100.00%) |
|
75 | updating: a 2/2 files (100.00%) | |
76 | picked tool 'true' for a (binary False symlink False) |
|
76 | picked tool 'true' for a (binary False symlink False) | |
77 | merging a |
|
77 | merging a | |
@@ -100,11 +100,11 b'' | |||||
100 | resolving manifests |
|
100 | resolving manifests | |
101 | branchmerge: False, force: False, partial: False |
|
101 | branchmerge: False, force: False, partial: False | |
102 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb |
|
102 | ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb | |
|
103 | preserving a for resolve of a | |||
103 | b: remote created -> g |
|
104 | b: remote created -> g | |
104 | a: versions differ -> m |
|
|||
105 | preserving a for resolve of a |
|
|||
106 | getting b |
|
105 | getting b | |
107 | updating: b 1/2 files (50.00%) |
|
106 | updating: b 1/2 files (50.00%) | |
|
107 | a: versions differ -> m | |||
108 | updating: a 2/2 files (100.00%) |
|
108 | updating: a 2/2 files (100.00%) | |
109 | picked tool 'true' for a (binary False symlink False) |
|
109 | picked tool 'true' for a (binary False symlink False) | |
110 | merging a |
|
110 | merging a | |
@@ -181,14 +181,14 b' create a second head' | |||||
181 | resolving manifests |
|
181 | resolving manifests | |
182 | branchmerge: True, force: True, partial: False |
|
182 | branchmerge: True, force: True, partial: False | |
183 | ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 |
|
183 | ancestor: c19d34741b0a, local: 1e71731e6fbb+, remote: 83c51d0caff4 | |
|
184 | preserving a for resolve of a | |||
|
185 | preserving b for resolve of b | |||
184 | a: versions differ -> m |
|
186 | a: versions differ -> m | |
185 | preserving a for resolve of a |
|
|||
186 | b: versions differ -> m |
|
|||
187 | preserving b for resolve of b |
|
|||
188 | updating: a 1/2 files (50.00%) |
|
187 | updating: a 1/2 files (50.00%) | |
189 | picked tool 'true' for a (binary False symlink False) |
|
188 | picked tool 'true' for a (binary False symlink False) | |
190 | merging a |
|
189 | merging a | |
191 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a |
|
190 | my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a | |
|
191 | b: versions differ -> m | |||
192 | updating: b 2/2 files (100.00%) |
|
192 | updating: b 2/2 files (100.00%) | |
193 | picked tool 'true' for b (binary False symlink False) |
|
193 | picked tool 'true' for b (binary False symlink False) | |
194 | merging b |
|
194 | merging b |
@@ -69,11 +69,11 b'' | |||||
69 | branchmerge: False, force: True, partial: False |
|
69 | branchmerge: False, force: True, partial: False | |
70 | ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf |
|
70 | ancestor: 91ebc10ed028+, local: 91ebc10ed028+, remote: 71a760306caf | |
71 | side1: other deleted -> r |
|
71 | side1: other deleted -> r | |
|
72 | removing side1 | |||
72 | side2: other deleted -> r |
|
73 | side2: other deleted -> r | |
73 | main: remote created -> g |
|
|||
74 | removing side1 |
|
|||
75 | removing side2 |
|
74 | removing side2 | |
76 | updating: side2 2/3 files (66.67%) |
|
75 | updating: side2 2/3 files (66.67%) | |
|
76 | main: remote created -> g | |||
77 | getting main |
|
77 | getting main | |
78 | updating: main 3/3 files (100.00%) |
|
78 | updating: main 3/3 files (100.00%) | |
79 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
79 | 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now