Mercurial Mercurial > hg / 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
author Matt Mackall <mpm@selenic.com>
Thu, 23 Apr 2009 15:40:10 -0500
changeset 8145 0c2ba48415c8
parent 4659 7a7d4937272b
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
test-archive: silence stupid messages from GNU tar Recent versions of GNU tar have apparently decided they're old enough that it's ok for them to prattle on senselessly about things no one cares about without anyone objecting. We object; apply duct tape.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3509
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
 
#!/bin/sh
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
 












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


hg init a













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


cd a













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


touch 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




     6


hg add 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




     7


hg commit -m 'add empty1' -d '1000000 0'













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


touch 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




    10


hg 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




    11


hg commit -m 'add empty2' -d '1000000 0'













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














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


hg up -C 0













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


touch 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




    15


hg 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




    16


hg commit -m 'add empty3' -d '1000000 0'













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














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


hg heads













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














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




    20


hg merge 1








4659






7a7d4937272b
Kill trailing spaces



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
3736

diff
changeset




    21


# before changeset 05257fd28591, we didn't notice the








3509






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




    22


# empty file that came from rev 1.













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




    23


hg status













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




    24


hg commit -m merge -d '1000000 0'








3736






ad3d5b4367cb
make manifest friendlier



Matt Mackall <mpm@selenic.com>


parents: 
3509

diff
changeset




    25


hg manifest --debug tip















Mercurial