annotate tests/test-double-merge.t @ 31196:3af9a9628ecf

revert: always display hunks reversed when reverting to parent When reverting to the parent of working directory, operation is "discard" so we want hunks to be presented in the same order as the diff (i.e. "reversed"). So we do not query the experimental.revertalternateinteractivemode option in this case and always set "reversehunks" to True.
author Denis Laxalde <denis.laxalde@logilab.fr>
date Mon, 06 Mar 2017 14:11:21 +0100
parents 564a354f7f35
children 91a0bc50b288
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
1 $ hg init repo
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
2 $ cd repo
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
4 $ echo line 1 > foo
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11973
diff changeset
5 $ hg ci -qAm 'add foo'
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
7 copy foo to bar and change both files
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
8 $ hg cp foo bar
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
9 $ echo line 2-1 >> foo
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
10 $ echo line 2-2 >> bar
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11973
diff changeset
11 $ hg ci -m 'cp foo bar; change both'
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
13 in another branch, change foo in a way that doesn't conflict with
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
14 the other changes
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
15 $ hg up -qC 0
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
16 $ echo line 0 > foo
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
17 $ hg cat foo >> foo
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11973
diff changeset
18 $ hg ci -m 'change foo'
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
19 created new head
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
20
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
21 we get conflicts that shouldn't be there
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
22 $ hg merge -P
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11973
diff changeset
23 changeset: 1:484bf6903104
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
24 user: test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11973
diff changeset
25 date: Thu Jan 01 00:00:00 1970 +0000
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
26 summary: cp foo bar; change both
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
27
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
28 $ hg merge --debug
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
29 searching for copies back to rev 1
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
30 unmatched files in other:
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
31 bar
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
32 all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
33 src: 'foo' -> dst: 'bar' *
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
34 checking for directory renames
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
35 resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
36 branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 12156
diff changeset
37 ancestor: e6dc8efe11cc, local: 6a0df1dad128+, remote: 484bf6903104
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 20945
diff changeset
38 preserving foo for resolve of bar
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 20945
diff changeset
39 preserving foo for resolve of foo
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27161
diff changeset
40 starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26517
diff changeset
41 bar: remote copied from foo -> 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
42 picked tool ':merge' for bar (binary False symlink False changedelete False)
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
43 merging foo and bar to bar
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11973
diff changeset
44 my bar@6a0df1dad128+ other bar@484bf6903104 ancestor foo@e6dc8efe11cc
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
45 premerge successful
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26517
diff changeset
46 foo: 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
47 picked tool ':merge' for foo (binary False symlink False changedelete False)
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
48 merging foo
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11973
diff changeset
49 my foo@6a0df1dad128+ other foo@484bf6903104 ancestor foo@e6dc8efe11cc
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
50 premerge successful
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
51 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
52 (branch merge, don't forget to commit)
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
53
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
54 contents of foo
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
55 $ cat foo
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
56 line 0
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
57 line 1
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
58 line 2-1
5042
f191bc3916f7 merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
59
11973
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
60 contents of bar
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
61 $ cat bar
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
62 line 0
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
63 line 1
b773ca489fd3 tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 8834
diff changeset
64 line 2-2
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
65
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
66 $ cd ..