view tests/test-diffdir @ 4416:bb1800a7d7e1

merge: fix spurious merges for copies in linear updates We make better use of contexts to accurately identify copies that don't need merges. Add a simple test and update other tests.
author Matt Mackall <mpm@selenic.com>
date Tue, 08 May 2007 02:59:13 -0500
parents f80cf8b7bbd9
children
line wrap: on
line source

#!/bin/sh

hg init
touch a
hg add a
hg ci -m "a" -d "1000000 0"

echo 123 > b
hg add b
hg diff --nodates

hg diff --nodates -r tip

echo foo > a
hg diff --nodates

hg diff -r ""
hg diff -r tip -r ""

true