Mercurial > hg
view tests/test-no-symlinks @ 6297:fed1a9c22076
dirstate.remove: during merges, remember the previous file state
We encode the previous state as a negative file size (AFAICS, previous
versions of hg always have size == 0 when state == 'r').
We save the state of 'm'erged and dirty files, because they're the
two states that indicate that a file has to be committed on a merge
to correctly record per-file history.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Tue, 18 Mar 2008 04:07:39 -0300 |
parents | fc6106267198 |
children |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" no-symlink || exit 80 # The following script was used to create the bundle: # # hg init symlinks # cd symlinks # echo a > a # mkdir d # echo b > d/b # ln -s a a.lnk # ln -s d/b d/b.lnk # hg ci -Am t # hg bundle --base null ../test-no-symlinks.hg # Extract a symlink on a platform not supporting them echo % unbundle hg init t cd t hg pull -q "$TESTDIR/test-no-symlinks.hg" hg update cat a.lnk && echo cat d/b.lnk && echo # Copy a symlink and move another echo % move and copy hg copy a.lnk d/a2.lnk hg mv d/b.lnk b2.lnk hg ci -Am copy cat d/a2.lnk && echo cat b2.lnk && echo # Bundle and extract again echo % bundle hg bundle --base null ../symlinks.hg cd .. hg init t2 cd t2 hg pull ../symlinks.hg hg update cat a.lnk && echo cat d/a2.lnk && echo cat b2.lnk && echo