Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-walk.out
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 981 4f81068ed8cd
child 1082 ce96e316278a
permissions -rw-r--r--
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
889
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     1
 
adding fennel
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     2
 
adding fenugreek
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     3
 
adding fiddlehead
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     4
 
adding glob:glob
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     5
 
adding beans/black
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     6
 
adding beans/borlotti
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     7
 
adding beans/kidney
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     8
 
adding beans/navy
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     9
 
adding beans/pinto
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    10
 
adding beans/turtle
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    11
 
adding mammals/skunk
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    12
 
adding mammals/Procyonidae/cacomistle
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    13
 
adding mammals/Procyonidae/coatimundi
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    14
 
adding mammals/Procyonidae/raccoon
942
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    15
 
f  fennel                          fennel
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    16
 
f  fenugreek                       fenugreek
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    17
 
f  fiddlehead                      fiddlehead
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    18
 
f  glob:glob                       glob:glob
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    19
 
f  beans/black                     beans/black
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    20
 
f  beans/borlotti                  beans/borlotti
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    21
 
f  beans/kidney                    beans/kidney
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    22
 
f  beans/navy                      beans/navy
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    23
 
f  beans/pinto                     beans/pinto
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    24
 
f  beans/turtle                    beans/turtle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    25
 
f  mammals/skunk                   mammals/skunk
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    26
 
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    27
 
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    28
 
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    29
 
f  mammals/skunk                   skunk
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    30
 
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    31
 
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    32
 
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    33
 
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    34
 
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    35
 
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    36
 
f  mammals/Procyonidae/cacomistle  cacomistle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    37
 
f  mammals/Procyonidae/coatimundi  coatimundi
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    38
 
f  mammals/Procyonidae/raccoon     raccoon
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    39
 
f  mammals/skunk                   ../skunk
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    40
 
f  mammals/Procyonidae/cacomistle  cacomistle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    41
 
f  mammals/Procyonidae/coatimundi  coatimundi
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    42
 
f  mammals/Procyonidae/raccoon     raccoon
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    43
 
f  beans/black     ../beans/black
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    44
 
f  beans/borlotti  ../beans/borlotti
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    45
 
f  beans/kidney    ../beans/kidney
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    46
 
f  beans/navy      ../beans/navy
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    47
 
f  beans/pinto     ../beans/pinto
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    48
 
f  beans/turtle    ../beans/turtle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    49
 
f  mammals/skunk                   skunk
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    50
 
f  mammals/Procyonidae/cacomistle  Procyonidae/cacomistle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    51
 
f  mammals/Procyonidae/coatimundi  Procyonidae/coatimundi
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    52
 
f  mammals/Procyonidae/raccoon     Procyonidae/raccoon
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    53
 
f  beans/black     beans/black
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    54
 
f  beans/borlotti  beans/borlotti
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    55
 
f  beans/kidney    beans/kidney
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    56
 
f  beans/navy      beans/navy
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    57
 
f  beans/pinto     beans/pinto
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    58
 
f  beans/turtle    beans/turtle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    59
 
f  beans/black     beans/black
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    60
 
f  beans/borlotti  beans/borlotti
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    61
 
f  mammals/skunk  mammals/skunk
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    62
 
f  mammals/skunk                   mammals/skunk
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    63
 
f  mammals/Procyonidae/cacomistle  mammals/Procyonidae/cacomistle
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    64
 
f  mammals/Procyonidae/coatimundi  mammals/Procyonidae/coatimundi
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    65
 
f  mammals/Procyonidae/raccoon     mammals/Procyonidae/raccoon
889
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    66
 
abort: .. not under repository root
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    67
 
abort: beans/../.. not under repository root
942
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    68
 
f  fennel      fennel
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    69
 
f  fenugreek   fenugreek
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    70
 
f  fiddlehead  fiddlehead
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    71
 
f  glob:glob   glob:glob
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    72
 
f  fenugreek      fenugreek
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    73
 
f  glob:glob      glob:glob
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    74
 
f  beans/black    beans/black
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    75
 
f  mammals/skunk  mammals/skunk
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    76
 
f  beans/black  beans/black
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    77
 
f  beans/black     beans/black
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    78
 
f  beans/borlotti  beans/borlotti
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    79
 
f  beans/kidney    beans/kidney
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    80
 
f  beans/navy      beans/navy
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    81
 
f  beans/pinto     beans/pinto
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    82
 
f  beans/turtle    beans/turtle
889
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    83
 
NOEXIST: No such file or directory
0a06d9d373c3 Add unit tests for walk code.
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
    84
 
fifo: unsupported file type (type is fifo)
942
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    85
 
m  fenugreek  fenugreek  exact
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    86
 
m  fenugreek  fenugreek  exact
7eb8cbcca7c4 Modify commands.walk to yield a 4-tuple.
Bryan O'Sullivan <bos@serpentine.com>
parents: 925
diff changeset 
    87
 
f  new  new  exact
mercurial-crew-with-dirclash