Mercurial > hg
view tests/test-diff-unified @ 8564:6b9ec23b09fc
named branches: improve pre-push logic (issue736)
Each named branch is considered separately, and the push is allowed if
no new branch heads are created for any named branch to be pushed.
Due to some tests's use of --debug, their output will change after this
addition. This has been fixed as well.
Co-contributor: Henrik Stuart <henrik.stuart@edlund.dk>
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Sat, 23 May 2009 17:04:31 +0200 |
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