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-merge-commit.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sat, 09 Jun 2007 01:04:28 -0300
changeset 4531 b51a8138292a
parent 4058 e7282dede8cd
child 5371 17ed9b9a0d03
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:
4058
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
merging bar and foo
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
(branch merge, don't forget to commit)
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
% contents of bar should be line0 line1 line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
line0
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 
line1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     8
 
line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     9
 
   rev    offset  length   base linkrev nodeid       p1           p2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    10
 
     0         0      77      0       2 da78c0659611 000000000000 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    11
 
     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    12
 
bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    13
 
   rev    offset  length   base linkrev nodeid       p1           p2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    14
 
     0         0       7      0       0 690b295714ae 000000000000 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    15
 
     1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    16
 
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    17
 
4:2d2f9a22c82b 2:0a3ab4856510
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    18
 
3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    19
 
2:0a3ab4856510 0:2665aaee66e9
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    20
 
1:5cd961e4045d
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    21
 
0:2665aaee66e9
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    22
 
% this should use bar@rev2 as the ancestor
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    23
 
resolving manifests
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    24
 
 overwrite None partial False
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    25
 
 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    26
 
 bar: versions differ -> m
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    27
 
merging bar
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    28
 
my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    29
 
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    30
 
(branch merge, don't forget to commit)
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    31
 
% contents of bar should be line1 line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    32
 
line1
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    33
 
line2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    34
 
   rev    offset  length   base linkrev nodeid       p1           p2
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    35
 
     0         0      77      0       2 da78c0659611 000000000000 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    36
 
     1        77      76      0       3 4b358025380b 000000000000 da78c0659611
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    37
 
     2       153       7      2       4 4defe5eec418 da78c0659611 000000000000
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    38
 
     3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b
e7282dede8cd filecommit: don't forget the local parent on a merge with a local rename
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
    39
 












e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    40














e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    41


requesting all changes













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    42


adding changesets













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    43


adding manifests













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    44


adding file changes













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    45


added 3 changesets with 3 changes to 2 files (+1 heads)













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    46


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    47


merging foo and bar













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    48


0 files updated, 1 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    49


(branch merge, don't forget to commit)













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    50


% contents of bar should be line0 line1 line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    51


line0













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    52


line1













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    53


line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    54


   rev    offset  length   base linkrev nodeid       p1           p2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    55


     0         0      77      0       2 da78c0659611 000000000000 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    56


     1        77      76      0       3 4b358025380b 000000000000 da78c0659611













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    57


bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    58


   rev    offset  length   base linkrev nodeid       p1           p2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    59


     0         0       7      0       0 690b295714ae 000000000000 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    60


     1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    61


1 files updated, 0 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    62


4:2d2f9a22c82b 2:0a3ab4856510 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    63


3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    64


2:0a3ab4856510 0:2665aaee66e9 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    65


1:5cd961e4045d 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    66


0:2665aaee66e9 













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    67


% this should use bar@rev2 as the ancestor













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    68


resolving manifests













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    69


 overwrite None partial False













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    70


 ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    71


 bar: versions differ -> m













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    72


merging bar













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    73


my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    74


0 files updated, 1 files merged, 0 files removed, 0 files unresolved













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    75


(branch merge, don't forget to commit)













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    76


% contents of bar should be line1 line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    77


line1













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    78


line2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    79


   rev    offset  length   base linkrev nodeid       p1           p2













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    80


     0         0      77      0       2 da78c0659611 000000000000 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    81


     1        77      76      0       3 4b358025380b 000000000000 da78c0659611













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    82


     2       153       7      2       4 4defe5eec418 da78c0659611 000000000000













e7282dede8cd
filecommit: don't forget the local parent on a merge with a local rename



Alexis S. L. Carvalho <alexis@cecm.usp.br>


parents: 

diff
changeset




    83


     3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b















mercurial-crew-with-dirclash