Mercurial Mercurial > mercurial / 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 Martin Geisler <mg@lazybytes.net>
Thu, 02 Sep 2010 23:22:51 +0200
changeset 12156 4c94b6d0fb1c
parent 6336 4b0c9c674707
permissions -rw-r--r--
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.
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
 
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
6336
4b0c9c674707 warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 5405
diff changeset 
     2
 
created new head
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 6336
diff changeset 
     3
 
changeset:   2:a1cb177e0d44
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 
     4
 
tag:         tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 6336
diff changeset 
     5
 
parent:      0:1e1d9c4e5b64
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 
     6
 
user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 6336
diff changeset 
     7
 
date:        Thu Jan 01 00:00:00 1970 +0000
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 
     8
 
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 
     9
 







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
6336

diff
changeset




    10


changeset:   1:097d2b0e17f6







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




    11


user:        test







12156






4c94b6d0fb1c
tests: remove unneeded -d flags



Martin Geisler <mg@lazybytes.net>


parents: 
6336

diff
changeset




    12


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







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




    13


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




    14














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


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




    16


(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




    17


M empty2







5405






8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
3509

diff
changeset




    18


b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty1












8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
3509

diff
changeset




    19


b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty2












8feb33c2d153
Display symlink or executable bit with manifest -v



Patrick Mezard <pmezard@gmail.com>


parents: 
3509

diff
changeset




    20


b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty3














mercurial