annotate tests/test-copy.out @ 4531:b51a8138292a

Avoid extra filelogs entries. Right now, there are some situations in which localrepo.filecommit can create filelog entries even though they're not needed. For example: - permissions for a file have changed; - qrefresh can create a filelog entry identical to its parent (see the added test); - convert-repo creates extra filelog entries in every merge where the first parent has added files (for example, changeset ebebe9577a1a of the kernel repo added extra filelog entries to files in the arch/blackfin directory, even though the merge should only touch the drivers/ata directory). This makes "hg log file" in a converted repo less useful than it could be, since it may mention many merges that don't actually touch that specific file. They all come from the same basic problem: localrepo.commit (through filecommit) creates new filelog entries for all files passed to it (except for some cases during a merge). Patch and test case provided by Benoit. This should fix issue351.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 09 Jun 2007 01:04:28 -0300
parents c0b449154a90
children d557749c627a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
1 A b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
2 b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
3 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
4 we should see two history entries
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2223
diff changeset
5 changeset: 1:386a3cc01532
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
6 tag: tip
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
7 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
8 date: Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
9 files: b
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
10 description:
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
11 2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
12
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
13
2966
fb493241d7f6 Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents: 2223
diff changeset
14 changeset: 0:33aaa84a386b
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
15 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
16 date: Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
17 files: a
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
18 description:
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
19 1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
20
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
21
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
22 we should see one log entry for a
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
23 changeset: 0:33aaa84a386b
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
24 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
25 date: Mon Jan 12 13:46:40 1970 +0000
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
26 summary: 1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
27
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
28 this should show a revision linked to changeset 0
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
29 rev offset length base linkrev nodeid p1 p2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
30 0 0 3 0 0 b789fdd96dc2 000000000000 000000000000
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
31 we should see one log entry for b
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
32 changeset: 1:386a3cc01532
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
33 tag: tip
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
34 user: test
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1044
diff changeset
35 date: Mon Jan 12 13:46:40 1970 +0000
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
36 summary: 2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
37
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
38 this should show a revision linked to changeset 1
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
39 rev offset length base linkrev nodeid p1 p2
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
40 0 0 65 0 1 9a263dd772e0 000000000000 000000000000
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
41 this should show the rename information in the metadata
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
42 copyrev: b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset
43 copy: a
3853
c0b449154a90 switch to the .hg/store layout, fix the tests
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 2966
diff changeset
44 ed156f22f0a6fde642de0b5eba0cbbb2 .hg/store/data/b.i
925
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 814
diff changeset
45 60b725f10c9c85c70d97880dfe8191b3 bsum
5a034646e472 run-tests: remove '+ hg' trick
mpm@selenic.com
parents: 814
diff changeset
46 60b725f10c9c85c70d97880dfe8191b3 asum
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
47 checking changesets
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
48 checking manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
49 crosschecking files in changesets and manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
50 checking files
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
51 2 files, 2 changesets, 2 total revisions