view tests/test-merge-remove @ 7305:c21d236ca897

hgweb: descend empty directories in web view

When a manifest has a series of directories with nothing in them but a single
directory, displaying the entire chain of empty directories allows for
navigation down to the first non-empty directory with a single click.

Because Java links package hierarchy to directory hierarchy, and because Java
conventions include at least three empty directories at the top of this
hierarchy, descending down empty directories is very common in Java web tools.

#!/bin/sh

hg init repo
cd repo

echo foo > foo
echo bar > bar
hg ci -qAm 'add foo bar'

echo foo2 >> foo
echo bleh > bar
hg ci -m 'change foo bar'

hg up -qC 0
hg mv foo foo1
echo foo1 > foo1
hg cat foo >> foo1
hg ci -m 'mv foo foo1'

hg merge
hg debugstate --nodates
hg st -q

echo '% removing foo1 and bar'
cp foo1 F
cp bar B
hg rm -f foo1 bar
hg debugstate --nodates
hg st -qC

echo '% readding foo1 and bar'
cp F foo1
cp B bar
hg add -v foo1 bar
hg debugstate --nodates
hg st -qC

echo '% reverting foo1 and bar'
hg revert -vr . foo1 bar
hg debugstate --nodates
hg st -qC
hg diff