[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

file externals fails to commit after merge

From: Joakim Tjernlund <joakim.tjernlund_at_transmode.se>
Date: Sat, 22 May 2010 22:52:32 +0200

rm -rf my_repo
rm -rf my_wc
REPO=file:///"$PWD"/my_repo
svnadmin create my_repo
mkdir -p my_wc/trunk
mkdir -p my_wc/tags
mkdir -p my_wc/branches
svn import -m "std layout" my_wc $REPO
rm -rf my_wc
svn mkdir -m "mkdir bin" $REPO/trunk/bin
svn mkdir -m "mkdir proj" $REPO/trunk/proj
svn co $REPO my_wc
echo rev1 > my_wc/trunk/bin/file
svn add my_wc/trunk/bin/file
svn propset svn:externals "../bin/file file" my_wc/trunk/proj
svn commit -m "svn:externals ../bin/file file" my_wc
svn copy -m "branch b1" $REPO/trunk/ $REPO/branches/b1
svn up my_wc
echo rev2 >> my_wc/trunk/proj/file
svn commit -m "rev2" my_wc
svn up my_wc
svn merge -c 6 $REPO/trunk/ my_wc/branches/b1
svn up my_wc
svn commit -m "merge" my_wc

#fails with:
#svn: Commit failed (details follow):
#svn: Cannot commit both '/usr/local/src/my_wc/branches/b1/proj/file' and '/usr/local/src/my_wc/branches/b1/bin/file' as they refer to the same URL

#svn, version 1.6.9 (r901367)
Received on 2010-05-24 10:57:09 CEST

This is an archived mail posted to the Subversion Dev mailing list.