Mercurial > hgsubversion
view tests/fixtures/commit-to-tag.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 | 9e6499c415a9 |
children |
line wrap: on
line source
#!/bin/sh mkdir temp cd temp svnadmin create repo REPOPATH="file://`pwd`/repo" svn co $REPOPATH wc cd wc mkdir -p branches/magic trunk tags svn add * svn ci -m 'btt' cd branches/magic for a in alpha beta gamma; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. svn up svn cp $REPOPATH/branches/magic $REPOPATH/tags/will-edit -m 'Make tag to edit' svn up cd branches/magic for a in delta iota lambda; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. cd tags/will-edit svn rm alpha svn ci -m 'removed alpha on a tag. Moves tag, implicit branch.' cd ../.. cd branches/magic for a in omega; do echo $a > $a svn add $a svn ci -m "Add file $a" done cd ../.. svn up svn cp $REPOPATH/branches/magic $REPOPATH/tags/also-edit -m 'Make tag to edit' svn up echo not omega > branches/magic/omega echo not omega > tags/also-edit/omega svn ci -m 'edit both the tag and its source branch at the same time' echo more stupidity > tags/also-edit/omega svn ci -m 'Edit an edited tag.' svn cp $REPOPATH/tags/also-edit $REPOPATH/tags/did-edits -m 'Tag an edited tag' svn cp $REPOPATH/branches/magic $REPOPATH/branches/closeme -m 'Make extra branch for another bogus case' svn cp $REPOPATH/branches/closeme $REPOPATH/tags/edit-later -m 'Make tag to edit after branch closes' svn rm $REPOPATH/branches/closeme -m 'Close the branch' svn up echo boofar > tags/edit-later/delta svn ci -m 'Edit this tag after its parent closed' # try and revert will-edit to its original state svn up svn merge -r9:8 $REPOPATH . svn ci -m 'Revert revision 9.' # make a tag from a branch and edit it at the same time svn up svn cp branches/magic tags/edit-at-create echo alpha >> tags/edit-at-create/alpha svn ci -m 'make a tag from a branch and edit it at the same time' cd ../.. svnadmin dump temp/repo > commit-to-tag.svndump echo echo 'Complete.' echo 'You probably want to clean up temp now.' echo 'Dump in commit-to-tag.svndump' exit 0