Mercurial > hg
view tests/test-clone-failure.t @ 14050:9e8a9d45945c stable
subrepo: handle svn tracked/unknown directory collisions
This happens more often than expected. Say you have an svn subrepository with
python code. Python would have generated unknown .pyc files. Now, you rebase
this setup on a revision where a directory containing python code does not
exist. Subversion is first asked to remove this directory when updating, but
will not because it contains untracked items. Then it will have to bring back
the directory after the merge but will fail because it now collides with an
untracked directory.
Using --force is not very elegant and only works with svn >= 1.5 but the only
alternative I can think of is to write our own purge command for subversion.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Fri, 04 Mar 2011 14:00:49 +0100 |
parents | bdb73eede5fb |
children | ffb5c09ba822 |
line wrap: on
line source
No local source $ hg clone a b abort: repository a not found! [255] No remote source $ hg clone http://127.0.0.1:3121/a b abort: error: Connection refused [255] $ rm -rf b # work around bug with http clone Inaccessible source $ mkdir a $ chmod 000 a $ hg clone a b abort: repository a not found! [255] Inaccessible destination $ mkdir b $ cd b $ hg init $ hg clone . ../a abort: Permission denied: ../a [255] $ cd .. $ chmod 700 a $ rm -r a b Source of wrong type $ if "$TESTDIR/hghave" -q fifo; then > mkfifo a > hg clone a b > rm a > else > echo "abort: repository a not found!" > fi abort: repository a not found! Default destination, same directory $ mkdir q $ cd q $ hg init $ cd .. $ hg clone q destination directory: q abort: destination 'q' is not empty [255] destination directory not empty $ mkdir a $ echo stuff > a/a $ hg clone q a abort: destination 'a' is not empty [255] leave existing directory in place after clone failure $ hg init c $ cd c $ echo c > c $ hg commit -A -m test adding c $ chmod -rx .hg/store/data $ cd .. $ mkdir d $ hg clone c d 2> err [255] $ test -d d $ test -d d/.hg [1] reenable perm to allow deletion $ chmod +rx c/.hg/store/data