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

Re: svn merge reports skipped misisng fictional files

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2005-12-22 21:40:38 CET

On Dec 22, 2005, at 21:16, Lieven Govaerts wrote:

>> svn mkdir http://server/svn/src/branches/bob
>> This one I grok. It makes a folder named "bob".
>>
>> svn copy http://server/svn/src/trunk/xyz
>> http://server/svn/src/branches/bob/xyz
>> I grok this too. When I checkout bob I get a folders bob and
>> bob/xyz and their contents alright. I even see the
>> repository looking normal when I list it.
>>
>> svn merge -r 7394:7401 http://server/svn/src/trunk But
>> when I try to merge from trunk I get the error for skipping
>> two missing targets, mysteriously named
>> "...bob\xyz\xyz\file1.cs" and "...bob\xyz\xyz\file2.resx".
>> This extra layer of \xyz\ makes no sense.
>> There was never such an extra subfolder that I can recall, but maybe
>> there was in the far gone mists of time. Long before I did
>> the mkdir.
>
> Isn't there one extra xyz folder created in your copy step?
>
> I'm not sure, but shouldn't you use this:
> svn copy http://server/svn/src/trunk/xyz
> http://server/svn/src/branches/bob/

That sounds like it could be the beginning of an explanation. To
continue, the problem is that this command has two possible outcomes:

svn copy \
http://server/svn/src/trunk/xyz \
http://server/svn/src/branches/bob/xyz

1) If branches/bob/xyz does not exist, then this command creates
branches/bob/xyz and copies the contents of trunk/xyz into it.

2) If branches/bob/xyz already exists, then this command creates
branches/bob/xyz/xyz and copies the contents of trunk/xyz into it.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 25 03:12:24 2005

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