Mercurial > hg

view tests/test-diff-newlines.out @ 9954:d6a307719ccb stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug in prepush logic involving merge changesets When creating new branches and merging them into existing ones, you would sometimes be able to push some changesets (the existing branches) without using --force, even when that creates a new head on the remote. A test which triggers the error has been added.
author Sune Foldager <cryo@cyanite.org>
date Mon, 30 Nov 2009 14:58:52 +0100
parents 3d1f9dcecdea
children
line wrap: on
line source

adding a
diff -r 107ba6f817b5 -r 310ce7989cdc a
--- a/a	Thu Jan 01 00:00:01 1970 +0000
+++ b/a	Thu Jan 01 00:00:02 1970 +0000
@@ -1,2 +1,3 @@
 confuse str.splitlines
 embedded
newline
+clean diff