Mercurial > hg
view tests/test-diff-unified @ 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 | d2a917b27152 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo cat > a <<EOF c c a a b a a c c EOF hg ci -Am adda cat > a <<EOF c c a a dd a a c c EOF echo '% default context' hg diff --nodates echo '% invalid --unified' hg diff --nodates -U foo echo '% --unified=2' hg diff --nodates -U 2 echo '% diff.unified=2' hg --config diff.unified=2 diff --nodates echo '% diff.unified=2 --unified=1' hg diff --nodates -U 1 echo '% invalid diff.unified' hg --config diff.unified=foo diff --nodates echo % test off-by-one error with diff -p hg init diffp cd diffp echo a > a hg ci -Ama rm a echo b > a echo a >> a echo c >> a hg diff -U0 -p --nodates exit 0