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

Merge/Add/Commit problem

From: Andreas Schweigstill <andreas_at_schweigstill.de>
Date: 2006-07-31 12:05:50 CEST

Dear all,

I have noticed the following problem with Subversion 1.3.1 and
pre-release of 1.4.0.

The behaviour of

svn co svn://myserever/myproject

and

svn co -r123 svn://myserever/myproject
svn merge -r123:HEAD

should be the same. But when there were some files added between
R123 and HEAD there is given an error message on the following
svn commit.

Here is a short skript which I tested on an empty repository:

svn co svn://simpson/test
pushd test
echo "AAA" > a
svn add a
svn commit -m"Added file a"

svn update
echo "BBB" > b
svn add b
svn commit -m"Added file b"

popd
svn co -r1 svn://simpson/test test_merge

pushd test_merge
svn merge -r1:2 .
svn update

popd

========================== CUT HERE ==========================

When running this script I get the following log:

Checked out revision 0.
~/svntest/test ~/svntest
A a
Adding a
Transmitting file data .
Committed revision 1.
At revision 1.
A b
Adding b
Transmitting file data .
Committed revision 2.
~/svntest
A test_merge/a
Checked out revision 1.
~/svntest/test_merge ~/svntest
A b
svn: Failed to add file 'b': object of the same name already exists
~/svntest
aschweig@simpson:~/svntest> svn st test_merge/
! test_merge
A + test_merge/b

========================== CUT HERE ==========================

It is possible neither with svn update, resolved, add etc. to
commit any of these files. Is this a feature or bug of subversion?
Is there a work-around?

With best regards
Andreas Schweigstill

-- 
Dipl.-Phys. Andreas Schweigstill
Schweigstill IT | Embedded Systems
Schauenburgerstraße 116, D-24118 Kiel, Germany
Phone: (+49) 431 5606-435, Fax: (+49) 431 5606-436
Mobile: (+49) 171 6921973, Web: http://www.schweigstill.de/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 31 12:07:07 2006

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