annotate tests/test-rename-merge2.t @ 40904:b2b8afd66f78

test: enable sparse-revlog for test-remotefilelog-log.t We are about to enable sparse-revlog globally. To help with reviewing the tests change, we isolate them in individual changesets. Differential Revision: https://phab.mercurial-scm.org/D5331
author Boris Feld <boris.feld@octobus.net>
date Mon, 12 Nov 2018 01:14:54 +0100
parents 5abc47d4ca6b
children 344066b54a7b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
2 $ mkdir -p t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
3 $ cd t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
4 $ cat <<EOF > merge
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
5 > import sys, os
39429
7450f6500b6e py3: write the file in str mode in tests/test-rename-merge2.t
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39285
diff changeset
6 > f = open(sys.argv[1], "w")
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
7 > f.write("merge %s %s %s" % (sys.argv[1], sys.argv[2], sys.argv[3]))
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
8 > f.close()
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
9 > EOF
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
10
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
11 perform a test merge with possible renaming
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
12 args:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
13 $1 = action in local branch
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
14 $2 = action in remote branch
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
15 $3 = action in working dir
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
16 $4 = expected result
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
17
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
18 $ tm()
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
19 > {
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12788
diff changeset
20 > hg init t
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
21 > cd t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
22 > echo "[merge]" >> .hg/hgrc
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
23 > echo "followcopies = 1" >> .hg/hgrc
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
24 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
25 > # base
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
26 > echo base > a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
27 > echo base > rev # used to force commits
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
28 > hg add a rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
29 > hg ci -m "base"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
30 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
31 > # remote
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
32 > echo remote > rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
33 > if [ "$2" != "" ] ; then $2 ; fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
34 > hg ci -m "remote"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
35 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
36 > # local
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
37 > hg co -q 0
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
38 > echo local > rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
39 > if [ "$1" != "" ] ; then $1 ; fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
40 > hg ci -m "local"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
41 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
42 > # working dir
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
43 > echo local > rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
44 > if [ "$3" != "" ] ; then $3 ; fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
45 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
46 > # merge
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
47 > echo "--------------"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
48 > echo "test L:$1 R:$2 W:$3 - $4"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
49 > echo "--------------"
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39429
diff changeset
50 > hg merge -y --debug --traceback --tool="\"$PYTHON\" ../merge"
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
51 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
52 > echo "--------------"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
53 > hg status -camC -X rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
54 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
55 > hg ci -m "merge"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
56 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
57 > echo "--------------"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
58 > echo
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
59 >
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
60 > cd ..
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
61 > rm -r t
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
62 > }
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
63 $ up() {
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
64 > cp rev $1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
65 > hg add $1 2> /dev/null
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
66 > if [ "$2" != "" ] ; then
12743
4c4aeaab2339 check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 12484
diff changeset
67 > cp rev $2
4c4aeaab2339 check-code: add 'no tab indent' check for unified tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 12484
diff changeset
68 > hg add $2 2> /dev/null
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
69 > fi
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
70 > }
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
71 $ uc() { up $1; hg cp $1 $2; } # update + copy
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
72 $ um() { up $1; hg mv $1 $2; }
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
73 $ nc() { hg cp $1 $2; } # just copy
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
74 $ nm() { hg mv $1 $2; } # just move
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
75 $ tm "up a " "nc a b" " " "1 get local a to b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
76 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
77 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
78 test L:up a R:nc a b W: - 1 get local a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
79 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
80 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
81 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
82 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
83 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
84 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
85 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
86 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
87 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
88 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
89 preserving a for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
90 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
91 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
92 b: remote copied from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
93 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
94 merging a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
95 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
96 premerge successful
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
97 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
98 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
99 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
100 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
101 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
102 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
103 my rev@e300d1c794ec+ other rev@4ce40f5aca24 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
104 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
105 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
106 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
107 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
108 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
109 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
110 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
111 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
112 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
113
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
114 $ tm "nc a b" "up a " " " "2 get rem change to a and b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
115 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
116 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
117 test L:nc a b R:up a W: - 2 get rem change to a and b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
118 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
119 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
120 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
121 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
122 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
123 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
124 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
125 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
126 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
127 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
128 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
129 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
130 a: remote is newer -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
131 getting a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
132 b: local copied/moved from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
133 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
134 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
135 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
136 premerge successful
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
137 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
138 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
139 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
140 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
141 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
142 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
143 my rev@86a2aa42fc76+ other rev@f4db7e329e71 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
144 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
145 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
146 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
147 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
148 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
149 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
150 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
151 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
152 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
153
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
154 $ tm "up a " "nm a b" " " "3 get local a change to b, remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
155 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
156 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
157 test L:up a R:nm a b W: - 3 get local a change to b, remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
158 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
159 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
160 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
161 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
162 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
163 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
164 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
165 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
166 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
167 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
168 preserving a for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
169 preserving rev for resolve of rev
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
170 removing a
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
171 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
172 b: remote moved from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
173 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
174 merging a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
175 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
176 premerge successful
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
177 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
178 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
179 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
180 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
181 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
182 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
183 my rev@e300d1c794ec+ other rev@bdb19105162a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
184 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
185 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
186 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
187 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
188 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
189 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
190 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
191 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
192
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
193 $ tm "nm a b" "up a " " " "4 get remote change to b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
194 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
195 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
196 test L:nm a b R:up a W: - 4 get remote change to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
197 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
198 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
199 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
200 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
201 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
202 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
203 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
204 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
205 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
206 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
207 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
208 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
209 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
210 b: local copied/moved from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
211 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
212 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
213 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
214 premerge successful
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
215 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
216 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
217 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
218 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
219 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
220 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
221 my rev@02963e448370+ other rev@f4db7e329e71 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
222 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
223 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
224 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
225 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
226 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
227 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
228 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
229 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
230
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
231 $ tm " " "nc a b" " " "5 get b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
232 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
233 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
234 test L: R:nc a b W: - 5 get b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
235 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
236 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
237 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
238 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
239 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
240 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
241 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
242 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
243 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
244 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
245 preserving rev for resolve of rev
18541
5ed6a375e9ca merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 18539
diff changeset
246 b: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
247 getting b
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
248 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
249 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
250 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
251 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
252 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
253 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
254 my rev@94b33a1b7f2d+ other rev@4ce40f5aca24 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
255 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
256 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
257 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
258 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
259 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
260 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
261 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
262 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
263
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
264 $ tm "nc a b" " " " " "6 nothing"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
265 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
266 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
267 test L:nc a b R: W: - 6 nothing
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
268 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
269 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
270 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
271 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
272 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
273 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
274 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
275 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
276 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
277 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
278 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
279 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
280 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
281 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
282 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
283 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
284 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
285 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
286 my rev@86a2aa42fc76+ other rev@97c705ade336 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
287 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
288 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
289 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
290 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
291 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
292 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
293 C b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
294 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
295
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
296 $ tm " " "nm a b" " " "7 get b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
297 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
298 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
299 test L: R:nm a b W: - 7 get b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
300 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
301 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
302 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
303 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
304 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
305 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
306 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
307 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
308 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
309 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
310 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
311 a: other deleted -> r
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
312 removing a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
313 b: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
314 getting b
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
315 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
316 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
317 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
318 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
319 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
320 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
321 my rev@94b33a1b7f2d+ other rev@bdb19105162a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
322 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
323 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
324 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
325 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
326 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
327 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
328 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
329
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
330 $ tm "nm a b" " " " " "8 nothing"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
331 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
332 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
333 test L:nm a b R: W: - 8 nothing
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
334 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
335 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
336 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
337 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
338 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
339 src: 'a' -> dst: 'b'
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
340 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
341 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
342 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
343 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
344 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
345 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
346 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
347 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
348 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
349 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
350 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
351 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
352 my rev@02963e448370+ other rev@97c705ade336 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
353 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
354 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
355 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
356 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
357 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
358 C b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
359 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
360
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
361 $ tm "um a b" "um a b" " " "9 do merge with ancestor in a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
362 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
363 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
364 test L:um a b R:um a b W: - 9 do merge with ancestor in a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
365 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
366 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
367 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
368 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
369 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
370 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
371 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
372 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
373 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
374 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
375 b: both renamed from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
376 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
377 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
378 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
379 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
380 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
381 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
382 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
383 b: both renamed from a -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
384 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
385 my b@62e7bf090eba+ other b@49b6d8032493 ancestor a@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
386 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
387 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
388 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
389 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
390 my rev@62e7bf090eba+ other rev@49b6d8032493 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
391 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
392 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
393 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
394 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
395 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
396 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
397 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
398
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
399
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
400 m "um a c" "um x c" " " "10 do merge with no ancestor"
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
401
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
402 $ tm "nm a b" "nm a c" " " "11 get c, keep b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
403 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
404 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
405 test L:nm a b R:nm a c W: - 11 get c, keep b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
406 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
407 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
408 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
409 b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
410 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
411 c
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
412 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18362
5a4f220fbfca copies: report found copies sorted
Mads Kiilerich <mads@kiilerich.com>
parents: 18135
diff changeset
413 src: 'a' -> dst: 'b' !
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
414 src: 'a' -> dst: 'c' !
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
415 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
416 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
417 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
418 ancestor: 924404dff337, local: 02963e448370+, remote: fe905ef2c33e
26957
d16d73173fdd merge: move messages about possible conflicts a litte earlier
Martin von Zweigbergk <martinvonz@google.com>
parents: 26618
diff changeset
419 note: possible conflict - a was renamed multiple times to:
d16d73173fdd merge: move messages about possible conflicts a litte earlier
Martin von Zweigbergk <martinvonz@google.com>
parents: 26618
diff changeset
420 b
d16d73173fdd merge: move messages about possible conflicts a litte earlier
Martin von Zweigbergk <martinvonz@google.com>
parents: 26618
diff changeset
421 c
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
422 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
423 c: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
424 getting c
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
425 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
426 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
427 merging rev
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
428 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
429 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
430 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
431 my rev@02963e448370+ other rev@fe905ef2c33e ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
432 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
433 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
434 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
435 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
436 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
437 M c
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
438 C b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
439 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
440
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
441 $ tm "nc a b" "up b " " " "12 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
442 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
443 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
444 test L:nc a b R:up b W: - 12 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
445 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
446 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
447 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
448 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
449 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
450 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
451 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
452 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
453 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
454 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
455 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
456 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
457 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
458 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
459 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
460 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
461 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
462 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
463 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
464 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
465 my b@86a2aa42fc76+ other b@af30c7647fc7 ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
466 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
467 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
468 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
469 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
470 my rev@86a2aa42fc76+ other rev@af30c7647fc7 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
471 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
472 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
473 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
474 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
475 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
476 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
477 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
478 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
479
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
480 $ tm "up b " "nm a b" " " "13 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
481 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
482 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
483 test L:up b R:nm a b W: - 13 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
484 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
485 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
486 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
487 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
488 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
489 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
490 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
491 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
492 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
493 a: other deleted -> r
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
494 removing a
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
495 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
496 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
497 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
498 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
499 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
500 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
501 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
502 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
503 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
504 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
505 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
506 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
507 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
508 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
509 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
510 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
511 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
512 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
513 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
514 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
515 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
516 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
517 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
518 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
519
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
520 $ tm "nc a b" "up a b" " " "14 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
521 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
522 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
523 test L:nc a b R:up a b W: - 14 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
524 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
525 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
526 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
527 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
528 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
529 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
530 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
531 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
532 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
533 a: remote is newer -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
534 getting a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
535 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
536 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
537 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
538 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
539 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
540 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
541 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
542 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
543 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
544 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
545 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
546 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
547 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
548 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
549 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
550 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
551 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
552 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
553 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
554 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
555 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
556 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
557 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
558 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
559
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
560 $ tm "up b " "nm a b" " " "15 merge b no ancestor, remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
561 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
562 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
563 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
564 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
565 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
566 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
567 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
568 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
569 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
570 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
571 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
572 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
573 a: other deleted -> r
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
574 removing a
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
575 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
576 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
577 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
578 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
579 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
580 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
581 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
582 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
583 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
584 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
585 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
586 my b@59318016310c+ other b@bdb19105162a ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
587 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
588 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
589 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
590 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
591 my rev@59318016310c+ other rev@bdb19105162a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
592 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
593 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
594 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
595 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
596 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
597 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
598 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
599
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
600 $ tm "nc a b" "up a b" " " "16 get a, merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
601 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
602 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
603 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
604 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
605 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
606 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
607 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
608 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
609 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
610 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
611 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
612 preserving rev for resolve of rev
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
613 a: remote is newer -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
614 getting a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
615 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
616 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
617 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
618 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
619 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
620 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
621 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
622 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
623 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
624 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
625 my b@86a2aa42fc76+ other b@8dbce441892a ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
626 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
627 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
628 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
629 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
630 my rev@86a2aa42fc76+ other rev@8dbce441892a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
631 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
632 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
633 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
634 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
635 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
636 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
637 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
638 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
639
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
640 $ tm "up a b" "nc a b" " " "17 keep a, merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
641 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
642 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
643 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
644 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
645 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
646 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
647 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
648 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
649 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
650 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
651 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
652 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
653 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
654 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
655 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
656 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
657 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
658 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
659 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
660 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
661 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
662 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
663 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
664 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
665 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
666 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
667 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
668 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
669 my rev@0b76e65c8289+ other rev@4ce40f5aca24 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
670 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
671 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
672 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
673 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
674 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
675 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
676 C a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
677 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
678
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
679 $ tm "nm a b" "up a b" " " "18 merge b no ancestor"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
680 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
681 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
682 test L:nm a b R:up a b W: - 18 merge b no ancestor
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
683 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
684 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
685 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
686 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
687 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
688 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
689 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27131
diff changeset
690 preserving b for resolve of b
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27131
diff changeset
691 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
692 starting 4 threads for background file closing (?)
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27131
diff changeset
693 a: prompt deleted/changed -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 27137
diff changeset
694 picked tool ':prompt' for a (binary False symlink False changedelete True)
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
695 file 'a' was deleted in local [working copy] but was modified in other [merge rev].
39277
f785073f792c merge: improve interactive one-changed one-deleted message (issue5550)
Augie Fackler <augie@google.com>
parents: 35704
diff changeset
696 What do you want to do?
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27163
diff changeset
697 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
698 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
699 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
700 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
701 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
702 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
703 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
704 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
705 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
706 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
707 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
708 my b@02963e448370+ other b@8dbce441892a ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
709 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
710 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
711 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
712 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
713 my rev@02963e448370+ other rev@8dbce441892a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
714 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
715 merge tool returned: 0
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27163
diff changeset
716 0 files updated, 2 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 33286
diff changeset
717 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
718 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
719 M a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
720 M b
29975
c15f06109b7a localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29775
diff changeset
721 abort: unresolved merge conflicts (see 'hg help resolve')
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
722 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
723
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
724 $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
725 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
726 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
727 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
728 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
729 searching for copies back to rev 1
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
730 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
731 b
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
732 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
733 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
734 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27131
diff changeset
735 preserving a for resolve of a
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27131
diff changeset
736 preserving b for resolve of b
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27131
diff changeset
737 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
738 starting 4 threads for background file closing (?)
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27131
diff changeset
739 a: prompt changed/deleted -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 27137
diff changeset
740 picked tool ':prompt' for a (binary False symlink False changedelete True)
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
741 file 'a' was deleted in other [merge rev] but was modified in local [working copy].
39277
f785073f792c merge: improve interactive one-changed one-deleted message (issue5550)
Augie Fackler <augie@google.com>
parents: 35704
diff changeset
742 What do you want to do?
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27163
diff changeset
743 use (c)hanged version, (d)elete, or leave (u)nresolved? u
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
744 b: both created -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
745 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
746 merging b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
747 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
748 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
749 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
750 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
751 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
752 b: both created -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
753 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
754 my b@0b76e65c8289+ other b@bdb19105162a ancestor b@000000000000
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
755 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
756 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
757 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
758 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
759 my rev@0b76e65c8289+ other rev@bdb19105162a ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
760 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
761 merge tool returned: 0
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27163
diff changeset
762 0 files updated, 2 files merged, 0 files removed, 1 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 33286
diff changeset
763 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
764 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
765 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
766 C a
29975
c15f06109b7a localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents: 29775
diff changeset
767 abort: unresolved merge conflicts (see 'hg help resolve')
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
768 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
769
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
770 $ tm "up a " "um a b" " " "20 merge a and b to b, remove a"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
771 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
772 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
773 test L:up a R:um a b W: - 20 merge a and b to b, remove a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
774 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
775 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
776 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
777 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
778 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
779 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
780 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
781 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
782 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
783 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
784 preserving a for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
785 preserving rev for resolve of rev
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
786 removing a
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
787 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
788 b: remote moved from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
789 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
790 merging a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
791 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
792 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
793 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
794 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
795 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
796 b: remote moved from a -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
797 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
798 my b@e300d1c794ec+ other b@49b6d8032493 ancestor a@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
799 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
800 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
801 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
802 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
803 my rev@e300d1c794ec+ other rev@49b6d8032493 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
804 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
805 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
806 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
807 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
808 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
809 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
810 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
811 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
812
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
813 $ tm "um a b" "up a " " " "21 merge a and b to b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
814 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
815 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
816 test L:um a b R:up a W: - 21 merge a and b to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
817 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
818 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
819 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
820 b
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
821 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
822 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
823 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
824 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
825 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
826 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
827 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
828 preserving rev for resolve of rev
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27599
diff changeset
829 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
830 b: local copied/moved from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
831 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
832 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
833 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
834 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
835 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
836 merging rev
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
837 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
838 b: local copied/moved from a -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
839 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
840 my b@62e7bf090eba+ other a@f4db7e329e71 ancestor a@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
841 launching merge tool: * ../merge *$TESTTMP/t/t/b* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
842 merge tool returned: 0
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
843 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
844 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
845 my rev@62e7bf090eba+ other rev@f4db7e329e71 ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
846 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
847 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
848 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
849 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
850 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
851 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
852 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
853 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
854
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
855
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
856 m "nm a b" "um x a" " " "22 get a, keep b"
3252
ae85272b59a4 merge: copy fixes and tests
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
857
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
858 $ tm "nm a b" "up a c" " " "23 get c, keep b"
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
859 created new head
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
860 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
861 test L:nm a b R:up a c W: - 23 get c, keep b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
862 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
863 searching for copies back to rev 1
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
864 unmatched files in local:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
865 b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
866 unmatched files in other:
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
867 c
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
868 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
869 src: 'a' -> dst: 'b' *
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
870 checking for directory renames
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
871 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18543
diff changeset
872 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
873 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
874 preserving b for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
875 preserving rev for resolve of rev
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 21082
diff changeset
876 c: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
877 getting c
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
878 b: local copied/moved from a -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
879 picked tool '* ../merge' for b (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
880 merging b and a to b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
881 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
882 premerge successful
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
883 rev: versions differ -> m (premerge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
884 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
885 merging rev
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
886 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
887 rev: versions differ -> m (merge)
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
888 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
889 my rev@02963e448370+ other rev@2b958612230f ancestor rev@924404dff337
33286
2428e8ec0793 tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents: 32151
diff changeset
890 launching merge tool: * ../merge *$TESTTMP/t/t/rev* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23524
diff changeset
891 merge tool returned: 0
12484
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
892 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
893 (branch merge, don't forget to commit)
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
894 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
895 M b
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
896 a
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
897 M c
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
898 --------------
59012130b43e tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents: 8167
diff changeset
899
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
900
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
901 $ cd ..
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
902
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
903
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
904 Systematic and terse testing of merge merges and ancestor calculation:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
905
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20945
diff changeset
906 Expected result:
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
907
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
908 \ a m1 m2 dst
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
909 0 - f f f "versions differ"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
910 1 f g g g "versions differ"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
911 2 f f f f "versions differ"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
912 3 f f g f+g "remote copied to " + f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
913 4 f f g g "remote moved to " + f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
914 5 f g f f+g "local copied to " + f2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
915 6 f g f g "local moved to " + f2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
916 7 - (f) f f "remote differs from untracked local"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
917 8 f (f) f f "remote differs from untracked local"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
918
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
919 $ hg init ancestortest
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
920 $ cd ancestortest
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
921 $ for x in 1 2 3 4 5 6 8; do mkdir $x; echo a > $x/f; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
922 $ hg ci -Aqm "a"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
923 $ mkdir 0
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
924 $ touch 0/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
925 $ hg mv 1/f 1/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
926 $ hg cp 5/f 5/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
927 $ hg mv 6/f 6/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
928 $ hg rm 8/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
929 $ for x in */*; do echo m1 > $x; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
930 $ hg ci -Aqm "m1"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
931 $ hg up -qr0
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
932 $ mkdir 0 7
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
933 $ touch 0/f 7/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
934 $ hg mv 1/f 1/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
935 $ hg cp 3/f 3/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
936 $ hg mv 4/f 4/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
937 $ for x in */*; do echo m2 > $x; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
938 $ hg ci -Aqm "m2"
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
939 $ hg up -qr1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
940 $ mkdir 7 8
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
941 $ echo m > 7/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
942 $ echo m > 8/f
26971
9f3410a52f44 test-rename-merge2: make selected output less arbitrary
Martin von Zweigbergk <martinvonz@google.com>
parents: 26957
diff changeset
943 $ hg merge -f --tool internal:dump -v --debug -r2 | sed '/^resolving manifests/,$d' 2> /dev/null
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
944 searching for copies back to rev 1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
945 unmatched files in local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
946 5/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
947 6/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
948 unmatched files in other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
949 3/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
950 4/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
951 7/f
20641
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
952 unmatched files new in both:
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
953 0/f
3db9e798e004 copies: when both sides made the same copy, report it as a copy
Mads Kiilerich <madski@unity3d.com>
parents: 20637
diff changeset
954 1/g
20637
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
955 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
956 src: '3/f' -> dst: '3/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
957 src: '4/f' -> dst: '4/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
958 src: '5/f' -> dst: '5/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
959 src: '6/f' -> dst: '6/g' *
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
960 checking for directory renames
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
961 $ hg mani
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
962 0/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
963 1/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
964 2/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
965 3/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
966 4/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
967 5/f
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
968 5/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
969 6/g
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
970 $ for f in */*; do echo $f:; cat $f; done
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
971 0/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
972 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
973 0/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
974 0/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
975 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
976 0/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
977 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
978 0/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
979 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
980 1/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
981 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
982 1/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
983 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
984 1/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
985 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
986 1/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
987 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
988 1/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
989 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
990 2/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
991 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
992 2/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
993 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
994 2/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
995 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
996 2/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
997 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
998 2/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
999 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1000 3/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1001 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1002 3/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1003 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1004 3/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1005 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1006 3/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1007 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1008 3/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1009 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1010 3/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1011 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1012 3/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1013 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1014 3/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1015 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1016 3/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1017 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1018 3/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1019 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1020 4/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1021 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1022 4/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1023 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1024 4/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1025 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1026 4/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1027 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1028 4/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1029 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1030 5/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1031 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1032 5/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1033 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1034 5/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1035 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1036 5/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1037 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1038 5/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1039 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1040 5/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1041 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1042 5/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1043 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1044 5/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1045 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1046 5/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1047 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1048 5/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1049 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1050 6/g:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1051 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1052 6/g.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1053 a
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1054 6/g.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1055 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1056 6/g.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1057 m1
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1058 6/g.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1059 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1060 7/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1061 m
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1062 7/f.base:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1063 7/f.local:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1064 m
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1065 7/f.orig:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1066 m
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1067 7/f.other:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1068 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1069 8/f:
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1070 m2
73a3a2386654 tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents: 19095
diff changeset
1071 $ cd ..