Mercurial > hg
annotate tests/test-rename-merge2.t @ 50329:3dbc7b1ecaba stable
typing: correct the signature of error.CommandError
There's a place in `mercurial.dispatch._parse()` that passes None if a parse
error happens before the command can be parsed out, and casting the error to
bytes works fine because the command and message fields are apparently ignored.
Likewise, TortoiseHg similarly passes None for the same reason.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Fri, 24 Mar 2023 02:22:12 -0400 |
parents | 6b1049d71c3e |
children |
rev | line source |
---|---|
3252 | 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 | 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 $ um() { up $1; hg mv $1 $2; } |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
72 $ nc() { hg cp $1 $2; } # just copy |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
73 $ nm() { hg mv $1 $2; } # just move |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
74 $ 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
|
75 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
76 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
77 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
|
78 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
79 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
80 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
|
81 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
82 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
83 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
84 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
85 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
86 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
87 ancestor: 924404dff337, local: e300d1c794ec+, remote: 4ce40f5aca24 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
88 starting 4 threads for background file closing (?) |
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 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
91 b: remote copied from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
92 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
|
93 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
94 my b@e300d1c794ec+ other b@4ce40f5aca24 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
95 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
96 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
97 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
|
98 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
99 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
|
100 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
|
101 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
102 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
|
103 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
104 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
105 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
106 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
107 C a |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
110 $ 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
|
111 created new head |
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 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
|
114 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
115 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
116 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
|
117 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
118 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
119 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
120 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
121 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
122 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
123 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: f4db7e329e71 |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
124 a: remote is newer -> g |
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
125 getting a |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
126 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
|
127 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
128 b: local copied/moved from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
129 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
|
130 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
131 my b@86a2aa42fc76+ other a@f4db7e329e71 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
132 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
133 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
134 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
|
135 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
136 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
|
137 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
|
138 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
139 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
|
140 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
141 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
142 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
143 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
144 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
145 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
146 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
147 $ 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
|
148 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
149 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
150 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
|
151 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
152 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
153 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
|
154 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
155 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
156 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
157 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
158 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
159 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
160 ancestor: 924404dff337, local: e300d1c794ec+, remote: bdb19105162a |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
161 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
162 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
|
163 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
|
164 removing a |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
165 b: remote moved from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
166 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
|
167 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
168 my b@e300d1c794ec+ other b@bdb19105162a ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
169 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
170 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
171 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
|
172 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
173 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
|
174 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
|
175 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
176 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
|
177 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
178 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
179 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
180 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
181 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
182 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
183 $ 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
|
184 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
185 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
186 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
|
187 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
188 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
189 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
|
190 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
191 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
192 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
193 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
194 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
195 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
196 ancestor: 924404dff337, local: 02963e448370+, remote: f4db7e329e71 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
197 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
198 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
|
199 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
200 b: local copied/moved from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
201 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
|
202 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
203 my b@02963e448370+ other a@f4db7e329e71 ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
204 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
205 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
206 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
|
207 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
208 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
|
209 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
|
210 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
211 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
|
212 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
213 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
214 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
215 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
216 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
217 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
218 $ tm " " "nc a b" " " "5 get b" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
219 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
220 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
221 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
|
222 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
223 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
224 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
|
225 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
226 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
227 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
228 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
229 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
230 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
231 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: 4ce40f5aca24 |
18541
5ed6a375e9ca
merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18539
diff
changeset
|
232 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
|
233 getting b |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
234 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
235 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
236 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
|
237 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
238 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
|
239 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
|
240 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
241 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
|
242 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
243 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
244 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
245 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
246 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
247 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
248 $ tm "nc a b" " " " " "6 nothing" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
249 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
250 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
251 test L:nc a b R: W: - 6 nothing |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
252 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
253 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
254 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
|
255 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
256 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
257 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
258 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
259 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
260 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
261 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 97c705ade336 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
262 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
263 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
264 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
265 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
|
266 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
267 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
|
268 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
|
269 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
270 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
|
271 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
272 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
273 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
274 C b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
275 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
276 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
277 $ tm " " "nm a b" " " "7 get b" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
278 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
279 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
280 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
|
281 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
282 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
283 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
|
284 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
285 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
286 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
287 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
288 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
289 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
290 ancestor: 924404dff337, local: 94b33a1b7f2d+, remote: bdb19105162a |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
291 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
|
292 removing a |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
293 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
|
294 getting b |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
295 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
296 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
297 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
|
298 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
299 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
|
300 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
|
301 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
302 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
|
303 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
304 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
305 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
306 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
307 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
308 $ tm "nm a b" " " " " "8 nothing" |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
309 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
310 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
311 test L:nm a b R: W: - 8 nothing |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
312 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
313 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
314 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
|
315 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
316 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
317 src: 'a' -> dst: 'b' |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
318 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
319 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
320 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
321 ancestor: 924404dff337, local: 02963e448370+, remote: 97c705ade336 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
322 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
323 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
324 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
325 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
|
326 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
327 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
|
328 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
|
329 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
330 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
|
331 (branch merge, don't forget to commit) |
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 C b |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
336 $ 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
|
337 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
338 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
339 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
|
340 -------------- |
42164
96bd75e67a94
copies: fix up "fullcopy" with missing entries from "copy"
Martin von Zweigbergk <martinvonz@google.com>
parents:
42152
diff
changeset
|
341 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
342 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
343 src: 'a' -> dst: 'b' * |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
344 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
345 src: 'a' -> dst: 'b' * |
42164
96bd75e67a94
copies: fix up "fullcopy" with missing entries from "copy"
Martin von Zweigbergk <martinvonz@google.com>
parents:
42152
diff
changeset
|
346 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
347 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
348 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
349 ancestor: 924404dff337, local: 62e7bf090eba+, remote: 49b6d8032493 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
350 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
351 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
|
352 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
353 b: both renamed from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
354 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
|
355 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
356 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
|
357 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
|
358 merge tool returned: 0 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
359 rev: versions differ -> m |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
360 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
361 merging rev |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
362 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
|
363 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
|
364 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
365 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
|
366 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
367 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
368 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
369 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
370 |
3252 | 371 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
372 m "um a c" "um x c" " " "10 do merge with no ancestor" |
3252 | 373 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
374 $ 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
|
375 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
376 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
377 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
|
378 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
379 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
380 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
381 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
382 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
|
383 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
384 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
385 src: 'a' -> dst: 'b' ! |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
386 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
387 src: 'a' -> dst: 'c' ! |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
388 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
389 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
390 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
391 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
|
392 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
|
393 b |
d16d73173fdd
merge: move messages about possible conflicts a litte earlier
Martin von Zweigbergk <martinvonz@google.com>
parents:
26618
diff
changeset
|
394 c |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
395 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
|
396 getting c |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
397 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
398 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
399 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
|
400 merging rev |
e741972017d9
merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents:
21082
diff
changeset
|
401 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
|
402 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
|
403 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
404 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
|
405 (branch merge, don't forget to commit) |
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 M c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
408 C b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
409 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
410 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
411 $ 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
|
412 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
413 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
414 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
|
415 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
416 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
417 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
418 src: 'a' -> dst: 'b' |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
419 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
420 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
421 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
422 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: af30c7647fc7 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
423 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
424 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
|
425 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
426 b: both created -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
427 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
|
428 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
429 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
|
430 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
|
431 merge tool returned: 0 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
432 rev: versions differ -> m |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
433 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
434 merging rev |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
435 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
|
436 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
|
437 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
438 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
|
439 (branch merge, don't forget to commit) |
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 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
442 C a |
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 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
445 $ 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
|
446 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
447 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
448 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
|
449 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
450 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
451 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
452 src: 'a' -> dst: 'b' |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
453 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
454 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
455 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
456 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
457 a: other deleted -> r |
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
458 removing a |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
459 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
460 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
|
461 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
462 b: both created -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
463 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
|
464 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
465 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
|
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 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
468 rev: versions differ -> m |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
469 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
470 merging rev |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
471 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
|
472 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
|
473 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
474 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
|
475 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
476 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
477 M b |
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 "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
|
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: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
|
484 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
485 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
486 on local side: |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
487 src: 'a' -> dst: 'b' * |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
488 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
489 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
490 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
491 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
492 a: remote is newer -> g |
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
493 getting a |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
494 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
|
495 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
496 b: both renamed from a -> m |
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 |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
499 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
500 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
501 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
502 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
|
503 merging rev |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
504 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
|
505 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
|
506 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
507 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
|
508 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
509 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
510 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
511 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
512 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
513 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
514 $ 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
|
515 created new head |
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 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
|
518 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
519 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
520 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
521 src: 'a' -> dst: 'b' |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
522 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
523 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
524 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
525 ancestor: 924404dff337, local: 59318016310c+, remote: bdb19105162a |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
526 a: other deleted -> r |
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
527 removing a |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
528 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
529 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
|
530 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
531 b: both created -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
532 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
|
533 merging b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
534 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
|
535 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
|
536 merge tool returned: 0 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
537 rev: versions differ -> m |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
538 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
539 merging rev |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
540 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
|
541 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
|
542 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
543 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
|
544 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
545 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
546 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
547 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
548 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
549 $ 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
|
550 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
551 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
552 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
|
553 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
554 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
555 on local side: |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
556 src: 'a' -> dst: 'b' * |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
557 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
558 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
559 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
560 ancestor: 924404dff337, local: 86a2aa42fc76+, remote: 8dbce441892a |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
561 a: remote is newer -> g |
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
562 getting a |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
563 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
|
564 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
565 b: both renamed from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
566 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
|
567 merging b |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
568 my b@86a2aa42fc76+ other b@8dbce441892a ancestor a@924404dff337 |
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
569 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
570 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
571 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
|
572 merging rev |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
573 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
|
574 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
|
575 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
576 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
|
577 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
578 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
579 M a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
580 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
581 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
582 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
583 $ 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
|
584 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
585 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
586 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
|
587 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
588 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
589 on remote side: |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
590 src: 'a' -> dst: 'b' * |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
591 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
592 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
593 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
594 ancestor: 924404dff337, local: 0b76e65c8289+, remote: 4ce40f5aca24 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
595 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
596 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
|
597 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
598 b: both renamed from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
599 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
|
600 merging b |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
601 my b@0b76e65c8289+ other b@4ce40f5aca24 ancestor a@924404dff337 |
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
602 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
603 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
604 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
|
605 merging rev |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
606 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
|
607 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
|
608 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
609 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
|
610 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
611 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
612 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
613 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
614 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
615 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
616 $ 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
|
617 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
618 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
619 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
|
620 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
621 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
622 on local side: |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
623 src: 'a' -> dst: 'b' * |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
624 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
625 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
626 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
627 ancestor: 924404dff337, local: 02963e448370+, remote: 8dbce441892a |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
628 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
|
629 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
|
630 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
631 b: both renamed from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
632 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
|
633 merging b |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
634 my b@02963e448370+ other b@8dbce441892a ancestor a@924404dff337 |
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
635 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
636 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
637 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
|
638 merging rev |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
639 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
|
640 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
|
641 merge tool returned: 0 |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
642 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
643 (branch merge, don't forget to commit) |
12484
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 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
646 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
647 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
648 $ 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
|
649 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
650 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
651 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
|
652 -------------- |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
653 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
654 on remote side: |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
655 src: 'a' -> dst: 'b' * |
42222
57203e0210f8
copies: calculate mergecopies() based on pathcopies()
Martin von Zweigbergk <martinvonz@google.com>
parents:
42169
diff
changeset
|
656 checking for directory renames |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
657 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
658 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
659 ancestor: 924404dff337, local: 0b76e65c8289+, remote: bdb19105162a |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
660 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
|
661 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
|
662 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
663 b: both renamed from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
664 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
|
665 merging b |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
666 my b@0b76e65c8289+ other b@bdb19105162a ancestor a@924404dff337 |
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
667 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
668 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
669 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
|
670 merging rev |
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26611
diff
changeset
|
671 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
|
672 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
|
673 merge tool returned: 0 |
44237
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
674 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
b4057d001760
merge: when rename was made on both sides, use ancestor as merge base
Martin von Zweigbergk <martinvonz@google.com>
parents:
44197
diff
changeset
|
675 (branch merge, don't forget to commit) |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
676 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
677 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
678 C a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
679 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
680 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
681 $ 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
|
682 created new head |
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 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
|
685 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
686 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
687 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
|
688 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
689 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
690 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
691 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
692 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
693 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
694 ancestor: 924404dff337, local: e300d1c794ec+, remote: 49b6d8032493 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
695 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
696 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
|
697 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
|
698 removing a |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
699 b: remote moved from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
700 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
|
701 merging a and b to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
702 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
|
703 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
|
704 merge tool returned: 0 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
705 rev: versions differ -> m |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
706 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
707 merging rev |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
708 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
|
709 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
|
710 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
711 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
|
712 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
713 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
714 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
715 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
716 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
717 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
718 $ 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
|
719 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
720 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
721 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
|
722 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
723 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
724 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
|
725 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
726 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
727 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
728 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
729 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
730 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
731 ancestor: 924404dff337, local: 62e7bf090eba+, remote: f4db7e329e71 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
45488
diff
changeset
|
732 starting 4 threads for background file closing (?) |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
733 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
|
734 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
735 b: local copied/moved from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
736 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
|
737 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
738 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
|
739 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
|
740 merge tool returned: 0 |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
741 rev: versions differ -> m |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
742 picked tool '* ../merge' for rev (binary False symlink False changedelete False) (glob) |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
743 merging rev |
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
744 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
|
745 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
|
746 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
747 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
|
748 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
749 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
750 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
751 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
752 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
753 |
3252 | 754 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
755 m "nm a b" "um x a" " " "22 get a, keep b" |
3252 | 756 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
757 $ 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
|
758 created new head |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
759 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
760 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
|
761 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
762 unmatched files in local: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
763 b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
764 unmatched files in other: |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
765 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
|
766 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
767 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
768 src: 'a' -> dst: 'b' * |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
769 checking for directory renames |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
770 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18543
diff
changeset
|
771 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
13956
diff
changeset
|
772 ancestor: 924404dff337, local: 02963e448370+, remote: 2b958612230f |
45488
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
773 c: remote created -> g |
c4f14db3da1d
merge: move initial handling of mergeactions near to later one
Pulkit Goyal <7895pulkit@gmail.com>
parents:
44375
diff
changeset
|
774 getting c |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21389
diff
changeset
|
775 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
|
776 preserving rev for resolve of rev |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
777 b: local copied/moved from a -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
778 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
|
779 merging b and a to b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
780 my b@02963e448370+ other a@2b958612230f ancestor a@924404dff337 |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
781 premerge successful |
48427
38941a28406a
mergestate: merge `preresolve()` into `resolve()`
Martin von Zweigbergk <martinvonz@google.com>
parents:
46072
diff
changeset
|
782 rev: versions differ -> m |
33286
2428e8ec0793
tests: clean up even more direct `python` calls with $PYTHON
Augie Fackler <augie@google.com>
parents:
32151
diff
changeset
|
783 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
|
784 merging rev |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
785 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
|
786 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
|
787 merge tool returned: 0 |
12484
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
788 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
|
789 (branch merge, don't forget to commit) |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
790 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
791 M b |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
792 a |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
793 M c |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
794 -------------- |
59012130b43e
tests: unify test-rename-merge2
Matt Mackall <mpm@selenic.com>
parents:
8167
diff
changeset
|
795 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
796 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
797 $ cd .. |
20637
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
798 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
799 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
800 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
|
801 |
21024
7731a2281cf0
spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents:
20945
diff
changeset
|
802 Expected result: |
20637
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
803 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
804 \ a m1 m2 dst |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
805 0 - f f f "versions differ" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
806 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
|
807 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
|
808 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
|
809 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
|
810 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
|
811 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
|
812 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
|
813 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
|
814 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
815 $ hg init ancestortest |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
816 $ cd ancestortest |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
817 $ 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
|
818 $ hg ci -Aqm "a" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
819 $ mkdir 0 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
820 $ touch 0/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
821 $ hg mv 1/f 1/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
822 $ hg cp 5/f 5/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
823 $ hg mv 6/f 6/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
824 $ hg rm 8/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
825 $ 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
|
826 $ hg ci -Aqm "m1" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
827 $ hg up -qr0 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
828 $ mkdir 0 7 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
829 $ touch 0/f 7/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
830 $ hg mv 1/f 1/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
831 $ hg cp 3/f 3/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
832 $ hg mv 4/f 4/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
833 $ 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
|
834 $ hg ci -Aqm "m2" |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
835 $ hg up -qr1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
836 $ mkdir 7 8 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
837 $ echo m > 7/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
838 $ echo m > 8/f |
26971
9f3410a52f44
test-rename-merge2: make selected output less arbitrary
Martin von Zweigbergk <martinvonz@google.com>
parents:
26957
diff
changeset
|
839 $ 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
|
840 unmatched files in local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
841 5/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
842 6/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
843 unmatched files in other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
844 3/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
845 4/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
846 7/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
847 all copies found (* = to merge, ! = divergent, % = renamed and deleted): |
44197
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
848 on local side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
849 src: '1/f' -> dst: '1/g' * |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
850 src: '5/f' -> dst: '5/g' * |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
851 src: '6/f' -> dst: '6/g' * |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
852 on remote side: |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
853 src: '1/f' -> dst: '1/g' * |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
854 src: '3/f' -> dst: '3/g' * |
17e12938f8e7
copies: print debug information about copies per side/branch
Martin von Zweigbergk <martinvonz@google.com>
parents:
42565
diff
changeset
|
855 src: '4/f' -> dst: '4/g' * |
20637
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
856 checking for directory renames |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
857 $ hg mani |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
858 0/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
859 1/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
860 2/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
861 3/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
862 4/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
863 5/f |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
864 5/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
865 6/g |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
866 $ 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
|
867 0/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
868 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
869 0/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
870 0/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
871 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
872 0/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
873 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
874 0/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
875 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
876 1/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
877 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
878 1/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
879 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
880 1/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
881 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
882 1/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
883 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
884 1/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
885 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
886 2/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
887 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
888 2/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
889 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
890 2/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
891 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
892 2/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
893 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
894 2/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
895 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
896 3/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
897 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
898 3/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
899 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
900 3/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
901 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
902 3/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
903 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
904 3/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
905 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
906 3/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
907 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
908 3/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
909 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
910 3/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
911 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
912 3/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
913 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
914 3/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
915 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
916 4/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
917 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
918 4/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
919 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
920 4/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
921 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
922 4/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
923 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
924 4/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
925 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
926 5/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
927 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
928 5/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
929 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
930 5/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
931 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
932 5/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
933 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
934 5/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
935 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
936 5/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
937 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
938 5/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
939 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
940 5/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
941 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
942 5/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
943 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
944 5/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
945 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
946 6/g: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
947 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
948 6/g.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
949 a |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
950 6/g.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
951 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
952 6/g.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
953 m1 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
954 6/g.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
955 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
956 7/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
957 m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
958 7/f.base: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
959 7/f.local: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
960 m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
961 7/f.orig: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
962 m |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
963 7/f.other: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
964 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
965 8/f: |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
966 m2 |
73a3a2386654
tests: add systematic test of merge ancestor calculation
Mads Kiilerich <madski@unity3d.com>
parents:
19095
diff
changeset
|
967 $ cd .. |