Mercurial > hg
view tests/test-diff-change.out @ 9954:d6a307719ccb stable
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 | 9c6ae2e09e11 |
children |
line wrap: on
line source
invoking hg diff --nodates --change 1: diff -r 4bb65dda5db4 -r e9b286083166 file.txt --- a/file.txt +++ b/file.txt @@ -1,1 +1,1 @@ -first +second invoking hg diff --nodates --change e9b286083166: diff -r 4bb65dda5db4 -r e9b286083166 file.txt --- a/file.txt +++ b/file.txt @@ -1,1 +1,1 @@ -first +second invoking hg diff --nodates --change 6: diff -r e8a0797e73a6 -r aa9873050139 file.txt --- a/file.txt +++ b/file.txt @@ -6,6 +6,6 @@ 5 6 7 -8 +y 9 10 EOF