tests/test-manifest
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104 9514cbb6e4f6
parent 6737 7239e06e58e9
permissions -rwxr-xr-x
bdiff: normalize the diff (issue1295) When the common part of a diff can be moved forward, move it forward. Otherwise we don't get deterministic results (it would depends on the way we split for the recursion). That way we get identical hunks when doing the same change, it helps to solve issue1295 (inconsistent diffs on different side during a merge).

#!/bin/sh

# Source bundle was generated with the following script.
#
# hg init
# echo a > a
# ln -s a l
# hg ci -Ama -d'0 0'
# mkdir b
# echo a > b/a
# chmod +x b/a
# hg ci -Amb -d'1 0'

hg init
hg -q pull "$TESTDIR/test-manifest.hg"

echo % should be empty
hg manifest

hg co
hg manifest
hg manifest -v
hg manifest --debug
hg manifest -r 0
hg manifest -r 1
hg manifest -r tip

echo % should fail
hg manifest -r 2
hg manifest -r tip tip

hg manifest tip