You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Adam Lackorzynski <ad...@os.inf.tu-dresden.de> on 2004/02/06 21:55:47 UTC
merge --dry-run and "not under version control"
Hi,
I recently tried to merge a new upstream version already in my repo into
my working copy. First, I tried with "--dry-run" which gives
svn: Use --force to override this restriction
svn: 'filex' is not under version control
for a file to be added. This file is executable. Using --force didn't
make any difference.
The following script reproduces this. Note that the dry-run-merge works
if the "chmod" is removed. The merge with the executable file also works
without the --dry-run option.
#! /bin/sh -x
rm -fr g
mkdir g
mkdir g/tree1
echo foo1 > g/tree1/file1
echo foo2 > g/tree1/file2
cp -a g/tree1 g/tree2
echo foo3 > g/tree2/filex
chmod +x g/tree2/filex
REPO=file:///$(pwd)/g/repo
svnadmin create g/repo
svn_load_dirs -no_user_input -t u/tags/1 $REPO u/trunk g/tree1
svn -m x cp $REPO/u/trunk $REPO/trunk
mkdir g/wc
( cd g/wc && svn co $REPO/trunk )
svn_load_dirs -no_user_input -t u/tags/2 $REPO u/trunk g/tree2
( cd g/wc/trunk && svn merge --dry-run $REPO/u/tags/1 $REPO/u/tags/2)
( cd g/wc/trunk && svn st)
Environment is Debian/sid/i386 with subversion 0.37.0 (r8509).
Adam
--
Adam adam@os.inf.tu-dresden.de
Lackorzynski http://os.inf.tu-dresden.de/~adam/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org