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

svn merge problem

From: Chuck Holzwarth <chuck_holzwarth_at_yahoo.com>
Date: Tue, 10 Feb 2009 07:56:14 -0800 (PST)

We are running version 1.5.4 (r33841). I have removed the URLs for confidentiality reasons.

The sequence of actions is:

I have Branches/Maintenance checked out already.

In the directory where I have Branches/Maintenance checked out I issue the following commands:

svn update
svn merge --depth=infinity http://XXX/svn/repos/trunk -r7:HEAD
This then reports an error.

I change directory to the Source directory and issue:
svn update
svn merge --depth=infinity http://XXX/svn/repos/trunk/Source -r7:HEAD
This then reports an error.

One of the error messages on the subversion server is:

[Fri Feb 06 15:02:16 2009] [error] [client 10.25.34.130] File not found: revision 4939, path '/Source/YYY/ZZZ/ZZZ.pas' [404, #160013]

There are many other instances of error messages with 404 errors.

There have been multiple occasions where branches have been renamed (Delete/Add as one operation). I know this type of thing has always caused problems with rolling back changes after the delete, the merge -r<REV>:<REV-1> would fail since the branch where it was performed did not exist any more. I have never seen this type of problem on a merge before, but it could be occurring due to the mergeinfo property.

 Thank you,
Chuck Holzwarth
Independent IT Consultant
(804) 403-3478 (home)
(804) 305-4040 (cell)

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1134728

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-02-10 16:57:39 CET

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