[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: Ryan Schmidt <subversion-2007b_at_ryandesign.com>
Date: 2007-07-17 02:36:15 CEST

On Jun 21, 2007, at 17:23, Fossen Charles-KWT678 wrote:

>>> 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 .

If "." is a working copy of trunk, and if your revision numbers are
correct, then that should have worked. I'm sorry I took so long to
reply, but I'm afraid I also don't have any great suggestions at this
point. Are you still experiencing the issue? Can you show us the
exact error message your receive?

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 17 02:35:53 2007

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