Mercurial > hg
annotate tests/test-merge-commit.t @ 48365:67064c238ae7
errors: use detailed exit code for non-integer number of diff context lines
Differential Revision: https://phab.mercurial-scm.org/D11826
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 19 Nov 2021 15:38:36 -0800 |
parents | 69429972ff1f |
children | 38941a28406a |
rev | line source |
---|---|
12328
b63f6422d2a7
tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents:
12254
diff
changeset
|
1 Check that renames are correctly saved by a commit after a merge |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
3 Test with the merge on 3 having the rename on the local parent |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
4 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
5 $ hg init a |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
6 $ cd a |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
7 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
8 $ echo line1 > foo |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
9 $ hg add foo |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
10 $ hg ci -m '0: add foo' |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
11 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
12 $ echo line2 >> foo |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
13 $ hg ci -m '1: change foo' |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
14 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
15 $ hg up -C 0 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
16 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
17 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
18 $ hg mv foo bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
19 $ rm bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
20 $ echo line0 > bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
21 $ echo line1 >> bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
22 $ hg ci -m '2: mv foo bar; change bar' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
23 created new head |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
24 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
25 $ hg merge 1 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
26 merging bar and foo to bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
27 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
28 (branch merge, don't forget to commit) |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
29 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
30 $ cat bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
31 line0 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
32 line1 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
33 line2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
34 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
35 $ hg ci -m '3: merge with local rename' |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
36 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12847
diff
changeset
|
37 $ hg debugindex bar |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
38 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
39 0 2 d35118874825 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
40 1 3 5345f5ab8abd 000000000000 d35118874825 |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
41 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
42 $ hg debugrename bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
43 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
44 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12847
diff
changeset
|
45 $ hg debugindex foo |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
46 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
47 0 0 690b295714ae 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
48 1 1 9e25c27b8757 690b295714ae 000000000000 |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
49 |
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
50 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
51 Revert the content change from rev 2: |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
52 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
53 $ hg up -C 2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
55 $ rm bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
56 $ echo line1 > bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
57 $ hg ci -m '4: revert content change from rev 2' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
58 created new head |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
59 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
60 $ hg log --template '{rev}:{node|short} {parents}\n' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
61 4:2263c1be0967 2:0f2ff26688b9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
62 3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
63 2:0f2ff26688b9 0:2665aaee66e9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
64 1:5cd961e4045d |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
65 0:2665aaee66e9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
66 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
67 This should use bar@rev2 as the ancestor: |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
68 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
69 $ hg --debug merge 3 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
70 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
71 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
14182
diff
changeset
|
72 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 0555950ead28 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
42167
diff
changeset
|
73 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:
18605
diff
changeset
|
74 preserving bar for resolve of bar |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26517
diff
changeset
|
75 bar: versions differ -> m (premerge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
76 picked tool ':merge' for bar (binary False symlink False changedelete False) |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
77 merging bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
78 my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
79 premerge successful |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
80 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
81 (branch merge, don't forget to commit) |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
82 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
83 $ cat bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
84 line1 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
85 line2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
86 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
87 $ hg ci -m '5: merge' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
88 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12847
diff
changeset
|
89 $ hg debugindex bar |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
90 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
91 0 2 d35118874825 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
92 1 3 5345f5ab8abd 000000000000 d35118874825 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
93 2 4 ff4b45017382 d35118874825 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
94 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
95 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
96 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
97 Same thing, but with the merge on 3 having the rename |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
98 on the remote parent: |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
99 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
100 $ cd .. |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
101 $ hg clone -U -r 1 -r 2 a b |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
102 adding changesets |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
103 adding manifests |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
104 adding file changes |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
105 added 3 changesets with 3 changes to 2 files (+1 heads) |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
28318
diff
changeset
|
106 new changesets 2665aaee66e9:0f2ff26688b9 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
107 $ cd b |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
108 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
109 $ hg up -C 1 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
110 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
111 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
112 $ hg merge 2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
113 merging foo and bar to bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
114 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
115 (branch merge, don't forget to commit) |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
116 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
117 $ cat bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
118 line0 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
119 line1 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
120 line2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
121 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
122 $ hg ci -m '3: merge with remote rename' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
123 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12847
diff
changeset
|
124 $ hg debugindex bar |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
125 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
126 0 2 d35118874825 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
127 1 3 5345f5ab8abd 000000000000 d35118874825 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
128 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
129 $ hg debugrename bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
130 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
131 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12847
diff
changeset
|
132 $ hg debugindex foo |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
133 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
134 0 0 690b295714ae 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
135 1 1 9e25c27b8757 690b295714ae 000000000000 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
136 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
137 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
138 Revert the content change from rev 2: |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
139 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
140 $ hg up -C 2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
141 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
142 $ rm bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
143 $ echo line1 > bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
144 $ hg ci -m '4: revert content change from rev 2' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
145 created new head |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
146 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
147 $ hg log --template '{rev}:{node|short} {parents}\n' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
148 4:2263c1be0967 2:0f2ff26688b9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
149 3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
150 2:0f2ff26688b9 0:2665aaee66e9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
151 1:5cd961e4045d |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
152 0:2665aaee66e9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
153 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
154 This should use bar@rev2 as the ancestor: |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
155 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
156 $ hg --debug merge 3 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
157 resolving manifests |
18605
bcf29565d89f
manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents:
18541
diff
changeset
|
158 branchmerge: True, force: False, partial: False |
15625
efdcce3fd2d5
merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents:
14182
diff
changeset
|
159 ancestor: 0f2ff26688b9, local: 2263c1be0967+, remote: 3ffa6b9e35f0 |
46072
69429972ff1f
tests: correct the output order about starting a background thread for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
42167
diff
changeset
|
160 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:
18605
diff
changeset
|
161 preserving bar for resolve of bar |
26618
8e6d5b7317e6
merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents:
26517
diff
changeset
|
162 bar: versions differ -> m (premerge) |
27161
296d55def9c4
filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents:
26618
diff
changeset
|
163 picked tool ':merge' for bar (binary False symlink False changedelete False) |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
164 merging bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
165 my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
166 premerge successful |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
167 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
168 (branch merge, don't forget to commit) |
4058
e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
169 |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
170 $ cat bar |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
171 line1 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
172 line2 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
173 |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
174 $ hg ci -m '5: merge' |
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
175 |
14182
ec5886db9dc6
tests: fix deprecated use of hg debugdata/debugindex
Sune Foldager <cryo@cyanite.org>
parents:
12847
diff
changeset
|
176 $ hg debugindex bar |
37283
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
177 rev linkrev nodeid p1 p2 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
178 0 2 d35118874825 000000000000 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
179 1 3 5345f5ab8abd 000000000000 d35118874825 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
180 2 4 ff4b45017382 d35118874825 000000000000 |
d4e62df1c73d
debugcommands: drop offset and length from debugindex by default
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37282
diff
changeset
|
181 3 5 3701b4893544 ff4b45017382 5345f5ab8abd |
12254
852f10a15a6d
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com>
parents:
8523
diff
changeset
|
182 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15625
diff
changeset
|
183 $ cd .. |