Mercurial > hg-stable

view tests/test-diff-newlines.out @ 10251:a19d2993385d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: fix merging of already merged subrepos (issue1986) This fixes a bug seen when merging a main repo which contains a subrepo when both repos have been merged before. Each repo (main and sub) has two branches, both of which have been merged before. In a subrepo, if the revision to merge to is an ancestor of the current rev, then the merge should be a noop. Test provided by Steve Losh.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Fri, 15 Jan 2010 21:08:04 +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