Mercurial > hg
annotate tests/test-double-merge.t @ 26228:0fd20a71abdb
extdiff: add a --patch argument for diffing changeset deltas
One of the things I missed the most when transitioning from versioned MQ to
evolve was the loss of being able to check that rebase conflicts were properly
resolved by:
$ hg ci --mq -m "before"
$ hg rebase -s qbase -d tip
$ hg bcompare --mq
The old csets stay in the tree with evolve, but a straight diff includes all of
the other changes that were pulled in, obscuring the code that was rebased.
Diffing deltas can be confusing, but unless radical changes were made during the
resolve, it is very clear when individual hunks are added, dropped or modified.
Unlike the MQ technique, this can only compare a single pair of csets/patches at
a time. Like the MQ method, this also highlights changes in the commit comment
and other metadata.
I originally tried monkey patching from the evolve extension, but that is too
complicated given that it depends on the order the two different extensions are
loaded. This functionality is also useful when comparing grafts however, so
implementing it in the core is more than just convenience.
The --change argument doesn't make much sense for this, but it isn't harmful so
I didn't bother blocking it. The -I/-X options are ignored because of a
limitation of cmdutil.export(). We'll fix that next.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 09 Sep 2015 21:07:38 -0400 |
parents | bd625cd4e5e7 |
children | d8463a743d7d |
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 |
20945
18adc15635a1
merge: keep destination filename as key in filemerge actions
Mads Kiilerich <madski@unity3d.com>
parents:
18605
diff
changeset
|
40 bar: remote copied from foo -> m |
11973
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
41 picked tool 'internal:merge' for bar (binary False symlink False) |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
42 merging foo and bar to bar |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11973
diff
changeset
|
43 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
|
44 premerge successful |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
20945
diff
changeset
|
45 foo: versions differ -> m |
11973
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
46 picked tool 'internal:merge' for foo (binary False symlink False) |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
47 merging foo |
12156
4c94b6d0fb1c
tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents:
11973
diff
changeset
|
48 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
|
49 premerge successful |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
50 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
|
51 (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
|
52 |
11973
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
53 contents of foo |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
54 $ cat foo |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
55 line 0 |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
56 line 1 |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
57 line 2-1 |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
58 |
11973
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
59 contents of bar |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
60 $ cat bar |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
61 line 0 |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
62 line 1 |
b773ca489fd3
tests: unify test-double-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8834
diff
changeset
|
63 line 2-2 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
64 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16795
diff
changeset
|
65 $ cd .. |