Mercurial > hg
view tests/test-archive-symlinks.t @ 18134:6c35b53cd28b
copies: separate moves via directory renames from explicit copies
Currently the "copy" dict contains both explicit copies/moves made by a
context and pending moves that need to happen because the other context moved
the directory the file was in. For explicit copies, the dict stores a
destination to source map, while for pending moves via directory renames, it
stores a source to destination map. The merge code uses this fact in a non-
obvious way to differentiate between these two cases.
We make this explicit by storing these pending moves in a separate dict. The
dict still has a source to destination map, but that is called out in the
docstring.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 26 Dec 2012 14:50:17 -0800 |
parents | f2719b387380 |
children | 6d632cf8a811 |
line wrap: on
line source
$ "$TESTDIR/hghave" symlink || exit 80 $ origdir=`pwd` $ hg init repo $ cd repo $ ln -s nothing dangling avoid tar warnings about old timestamp $ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink' $ hg archive -t files ../archive $ hg archive -t tar -p tar ../archive.tar $ hg archive -t zip -p zip ../archive.zip files $ cd "$origdir" $ cd archive $ "$TESTDIR/readlink.py" dangling dangling -> nothing tar $ cd "$origdir" $ tar xf archive.tar $ cd tar $ "$TESTDIR/readlink.py" dangling dangling -> nothing zip $ cd "$origdir" $ unzip archive.zip > /dev/null $ cd zip $ "$TESTDIR/readlink.py" dangling dangling -> nothing $ cd ..