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-empty-file.out
author Matt Mackall <mpm@selenic.com>
Wed, 01 Aug 2007 12:33:12 -0500
changeset 5045 f191bc3916f7
parent 3506 9de0e64545a3
child 5405 8feb33c2d153
permissions -rw-r--r--
merge: do early copy to deal with issue636 Without copies/renames, merges source names are 1:1 with their targets. Copies and renames introduce the possibility that there will be two merges with the same input but different output. By doing the copy to the destination name before the merge, the actual merge becomes 1:1 again, and no source is the input to two different merges. - add a preliminary scan to applyupdates to do copies - for the merge action, pass the old name (for finding ancestors) and the new name (for input to the merge) to filemerge - eliminate the old post-merge copy - lookup file contents from new name in filemerge - pass new name to external merge helper - report merge failure at new name - add a test
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3506
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     1
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     2
 
changeset:   2:62ec0e86d1e5
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     3
 
tag:         tip
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     4
 
parent:      0:567dde5e6e98
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     5
 
user:        test
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     6
 
date:        Mon Jan 12 13:46:40 1970 +0000
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     7
 
summary:     add empty3
9de0e64545a3 Test that we notice the empty files from the second parent during a merge
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset 
     8
 












9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




     9


changeset:   1:41ab7b321727













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    10


user:        test













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    11


date:        Mon Jan 12 13:46:40 1970 +0000













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    12


summary:     add empty2













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    13














9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    14


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













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    15


(branch merge, don't forget to commit)













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    16


M empty2













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    17


b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    18


b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2













9de0e64545a3
Test that we notice the empty files from the second parent during a merge



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


parents: 

diff
changeset




    19


b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3















mercurial-crew-with-dirclash