Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlink-basic @ 4510:e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).
Added a test for log -r. with one and two parents.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 06 Jun 2007 19:05:18 +0200 |
parents | af4f0d52f948 |
children | 6a8e1dd18ba2 |
line wrap: on
line source
#!/bin/sh cat >> readlink.py <<EOF import os import sys for f in sys.argv[1:]: print f, '->', os.readlink(f) EOF hg init a cd a ln -s nothing dangling hg add dangling hg commit -m 'add symlink' -d '0 0' hg tip -v hg manifest --debug echo '% rev 0:' python ../readlink.py dangling rm dangling ln -s void dangling hg commit -m 'change symlink' echo '% rev 1:' python ../readlink.py dangling echo '% modifying link' rm dangling ln -s empty dangling python ../readlink.py dangling echo '% reverting to rev 0:' hg revert -r 0 -a python ../readlink.py dangling echo '% backups:' python ../readlink.py *.orig rm *.orig hg up -C echo '% copies' hg cp -v dangling dangling2 hg st -Cmard python ../readlink.py dangling dangling2