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-flags.out
author mpm@selenic.com
Sun, 21 Aug 2005 21:59:55 -0700
changeset 990 5007e0bdeed2
parent 981 4f81068ed8cd
child 1043 9344f5dd4488
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:
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
     1
 
pulling from ../test1
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
     2
 
requesting all changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
     3
 
adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
     4
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
     5
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
     6
 
added 1 changesets with 2 changes to 2 files
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
     7
 
(run 'hg update' to get a working copy)
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
     8
 
pulling from ../test2
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
     9
 
searching for changes
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
    10
 
adding changesets
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
    11
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    12
 
adding file changes
122449dd89db Fix up test results
mpm@selenic.com
parents: 749
diff changeset 
    13
 
added 1 changesets with 1 changes to 1 files
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
    14
 
(run 'hg update' to get a working copy)
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset 
    15
 
changeset:   2:3ef543305655
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
    16
 
tag:         tip
784
853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes
mpm@selenic.com
parents: 775
diff changeset 
    17
 
parent:      0:22a449e20da5
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
    18
 
user:        test
967
1f3710636b45 [PATCH] Print timezone offset when outputting dates
Samuel Tardieu <sam@rfc1149.net>
parents: 925
diff changeset 
    19
 
date:        Thu Jan  1 00:00:00 1970 +0000
412
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
    20
 
summary:     chmod +x a
40cfa2d0c088 [PATCH]: Typo in localrepository.update
mpm@selenic.com
parents:
diff changeset 
    21
 







784






853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes



mpm@selenic.com


parents: 
775

diff
changeset




    22


changeset:   1:c6ecefc45368








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    23


user:        test








967






1f3710636b45
[PATCH] Print timezone offset when outputting dates



Samuel Tardieu <sam@rfc1149.net>


parents: 
925

diff
changeset




    24


date:        Thu Jan  1 00:00:00 1970 +0000








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    25


summary:     a updated













40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    26









784






853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes



mpm@selenic.com


parents: 
775

diff
changeset




    27


changeset:   2:3ef543305655








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    28


tag:         tip








784






853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes



mpm@selenic.com


parents: 
775

diff
changeset




    29


parent:      0:22a449e20da5








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    30


user:        test








967






1f3710636b45
[PATCH] Print timezone offset when outputting dates



Samuel Tardieu <sam@rfc1149.net>


parents: 
925

diff
changeset




    31


date:        Thu Jan  1 00:00:00 1970 +0000








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    32


summary:     chmod +x a













40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    33









784






853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes



mpm@selenic.com


parents: 
775

diff
changeset




    34


changeset:   1:c6ecefc45368








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    35


user:        test








967






1f3710636b45
[PATCH] Print timezone offset when outputting dates



Samuel Tardieu <sam@rfc1149.net>


parents: 
925

diff
changeset




    36


date:        Thu Jan  1 00:00:00 1970 +0000








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    37


summary:     a updated













40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    38









784






853bfbf1a312
Fix tests for short changeset hashes and hidden manifest hashes



mpm@selenic.com


parents: 
775

diff
changeset




    39


changeset:   0:22a449e20da5








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    40


user:        test








967






1f3710636b45
[PATCH] Print timezone offset when outputting dates



Samuel Tardieu <sam@rfc1149.net>


parents: 
925

diff
changeset




    41


date:        Thu Jan  1 00:00:00 1970 +0000








412






40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    42


summary:     added a b













40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    43














40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    44


resolving manifests













40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    45


merging a













40cfa2d0c088
[PATCH]: Typo in localrepository.update



mpm@selenic.com


parents: 

diff
changeset




    46


resolving a








491






66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
414

diff
changeset




    47


-rwxr-x---













66eb9905d0a2
Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
414

diff
changeset




    48


-rwxr-x---















mercurial-crew-with-dirclash