Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-changelog-exec.out @ 5242:466323968b23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Avoid adding to the changelog executable files added by the second parent. This was a regression introduced by b51a8138292a.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 27 Aug 2007 14:21:04 -0300
parents
children
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/tests/test-changelog-exec.out
@@ -0,0 +1,21 @@
+% manifest of p2:
+bar
+foo
+
+% manifest of p1:
+foo
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+(branch merge, don't forget to commit)
+% this should not mention bar:
+changeset:   3:ef2fc9b4a51b
+tag:         tip
+parent:      2:ed1b79f46b9a
+parent:      1:d394a8db219b
+user:        test
+date:        Thu Jan 01 00:00:00 1970 +0000
+description:
+merge
+
+
+   rev    offset  length   base linkrev nodeid       p1           p2
+     0         0       5      0       1 b004912a8510 000000000000 000000000000