tests/test-pull.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4531 b51a8138292a
parent 2955 9d1c3529ebbc
child 4888 2d545b98a7bc
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
767
61ed30e82b27 Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents: 642
diff changeset
     1
adding foo
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     2
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     3
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     4
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     5
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     6
1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     7
requesting all changes
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     8
adding changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     9
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
    10
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 767
diff changeset
    11
added 1 changesets with 1 changes to 1 files
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    12
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    13
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    14
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    15
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    16
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    17
1 files, 1 changesets, 1 total revisions
2175
b2ae81a7df29 Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents: 2152
diff changeset
    18
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    19
foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    20
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
522
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
    21
pulling from http://localhost:20059/
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
    22
searching for changes
2f1de824798a Fix empty pull bug that appeared this morning
mpm@selenic.com
parents: 350
diff changeset
    23
no changes found