Mercurial > hgsubversion
view tests/fixtures/branchtagcollision.sh @ 1234:d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
We alwasy fail editing for symlinks, since we strip the leading 'link '
subversion includes when storing in mercurial, and then let svn
attempt to apply deltas against the stripped version. This
unsurprisingly fails, and we write the resulting empty-string to the
Filestore for the current revision, and add the symlink in question to
the missing list to handle stupidly later.
Unfortunately, this would break down because editing adds files to the
store using their absolute path whereas missing files are added
relative to our subdir. the absolut path file appears to win, which
results in us getting a symlink whose target is the empty string.
This fixes the problem by adding missing files to the fileStore using
their absolute path.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Mon, 07 Apr 2014 18:28:35 -0700 |
parents | f28e0f54a6ef |
children |
line wrap: on
line source
#!/bin/bash # # Generate branchtagcollision.svndump # # Generates an svn repository with a branch and a tag that have the same name. mkdir temp cd temp svnadmin create testrepo svn checkout file://`pwd`/testrepo client cd client mkdir trunk mkdir branches mkdir tags svn add trunk branches tags svn commit -m "Initial commit" echo "fileA" >> trunk/fileA svn add trunk/fileA svn commit -m "Added fileA" svn cp trunk branches/A svn commit -m "added branch" echo "fileB" >> trunk/fileB svn add trunk/fileB svn commit -m "Added fileB" svn cp trunk tags/A svn commit -m "added bad tag" cd .. svnadmin dump testrepo > ../branchtagcollision.svndump