annotate tests/test-rename-merge2.t @ 46368:bb3a5c0df06b

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