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

RE: Merge skipped files in added dir

From: Fossen Charles-KWT678 <chuckf_at_motorola.com>
Date: 2007-06-22 00:23:13 CEST

>> I have spent a day searching through the archives looking for info
>> on my merge question.
>>
>>
>>
>> I am doing a merge from a vendor branch to the trunk.
>>
>> The change set includes a new directory tree of files.
>>
>> svn adds the new directories but skips the files under those
>> directories.
>>
>> My svn client is 1.4.2. The server is 1.2.x.
>>
>> Example follows.
>>
>>
>>
>> Is this expected behavior?

>No, it's not. It usually means you've performed the wrong merge. Can
>you show us the merge command you used?

svn merge -r 32118:32621 https://svn.repo.com/embedded/vendor/trunk .

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 22 00:23:20 2007

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