annotate tests/test-empty-file.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 f2719b387380
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12159
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
1 $ hg init a
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
2 $ cd a
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
3 $ touch empty1
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
4 $ hg add empty1
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
5 $ hg commit -m 'add empty1'
3509
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
6
12159
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
7 $ touch empty2
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
8 $ hg add empty2
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
9 $ hg commit -m 'add empty2'
3509
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
10
12159
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
11 $ hg up -C 0
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
12 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
13 $ touch empty3
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
14 $ hg add empty3
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
15 $ hg commit -m 'add empty3'
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
16 created new head
3509
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
17
12159
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
18 $ hg heads
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
19 changeset: 2:a1cb177e0d44
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
20 tag: tip
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
21 parent: 0:1e1d9c4e5b64
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
22 user: test
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
23 date: Thu Jan 01 00:00:00 1970 +0000
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
24 summary: add empty3
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
25
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
26 changeset: 1:097d2b0e17f6
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
27 user: test
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
28 date: Thu Jan 01 00:00:00 1970 +0000
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
29 summary: add empty2
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
30
3509
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
31
12159
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
32 $ hg merge 1
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
33 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
34 (branch merge, don't forget to commit)
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
35
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
36 Before changeset 05257fd28591, we didn't notice the
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
37 empty file that came from rev 1:
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
38
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
39 $ hg status
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
40 M empty2
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
41 $ hg commit -m merge
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
42 $ hg manifest --debug tip
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
43 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
44 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
45 b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3
8bedcfc38659 tests: unify test-empty-file
Adrian Buehlmann <adrian@cadifra.com>
parents: 12156
diff changeset
46
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 12159
diff changeset
47 $ cd ..