Mercurial > hg
view tests/test-archive-symlinks.t @ 19986:ea81f8b2364e stable
rebase: fix working copy location after a --collapse (issue4080)
Rebasing with --collapse would leave the working copy on the parent of the
collapsed commit, instead of on the collapsed commit. This fixes that. Also
fixes a few tests that already covered this area but had bad data.
This also fixes issue3716 where bookmarks are not kept across rebases with
--collapse. I updated the test to cover that case as well.
author | Durham Goode <durham@fb.com> |
---|---|
date | Fri, 01 Nov 2013 17:08:06 -0700 |
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 ..