Mercurial > hg
view tests/test-merge-types @ 6177:673d8a6bc709
Renamed "manifest" to "files" in web templates.
manifest.tmpl is still used, so people having their own templates don't have
to change them. "cmd=manifest" still works, new style URLs are not affected,
because they already used "/file/".
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 26 Feb 2008 22:42:37 +0100 |
parents | 026eb80060d8 |
children |
line wrap: on
line source
#!/bin/sh hg init echo a > a hg ci -Amadd # 0 chmod +x a hg ci -mexecutable # 1 hg up 0 rm a ln -s symlink a hg ci -msymlink # 2 hg merge --debug echo % symlink is local parent, executable is other if [ -h a ]; then echo a is a symlink $TESTDIR/readlink.py a elif [ -x a ]; then echo a is executable else echo "a has no flags (default for conflicts)" fi hg update -C 1 hg merge --debug echo % symlink is other parent, executable is local if [ -h a ]; then echo a is a symlink $TESTDIR/readlink.py a elif [ -x a ]; then echo a is executable else echo "a has no flags (default for conflicts)" fi