Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-empty-file.out @ 3506:9de0e64545a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 25 Oct 2006 02:51:27 -0300
parents
children 8feb33c2d153
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-empty-file.out
@@ -0,0 +1,19 @@
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+changeset:   2:62ec0e86d1e5
+tag:         tip
+parent:      0:567dde5e6e98
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     add empty3
+
+changeset:   1:41ab7b321727
+user:        test
+date:        Mon Jan 12 13:46:40 1970 +0000
+summary:     add empty2
+
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+M empty2
+b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty1
+b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty2
+b80de5d138758541c5f05265ad144ab9fa86d1db 644 empty3