Difficulty doing SVN merge with new files in trunk

Question

I'm getting these errors when I try to merge the new trunk revision with my branch...  svn merge http://opensource.adobe.com/svn/opensource/flex/sdk/trunk http://opensource.adobe.com/svn/opensource/flex/sdk/sandbox/viatropos   Skipped missing target: 'frameworks/projects/spark/src/spark/components/Label.as'Skipped missing target: 'frameworks/projects/spark/src/spark/components/RichText.as'Skipped missing target: 'frameworks/projects/spark/src/spark/components/RichEditableText.png'Skipped missing target: 'frameworks/projects/spark/src/spark/components/RichText.png'Skipped missing target: 'frameworks/projects/spark/src/spark/components/RichEditableText.as'Skipped missing target: 'frameworks/projects/spark/src/spark/components/Label.png'Skipped missing target: 'frameworks/projects/spark/src/spark/components/supportClasses/TextBase.as'Skipped missing target: 'frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextContainerManager.as'Skipped missing target: 'frameworks/projects/spark/src/spark/components/supportClasses/RichEditableTextEditManager.as'  I can't find any info on how to fix this, do you happen to know what's going on?  I'm a git user, this is my first time with svn.  Thanks a lot,Lance

viatropos · Answer

For anyone new to svn like me:svn merge -r 9731:10043 http://opensource.adobe.com/svn/opensource/flex/sdk/trunk . The two numbers merge the differences between the two revision numbers (old:new), from the source url, to ".", the local directory. That added the correct files and updated everything. Best,Lance

Sign up

To post, reply, or follow discussions, please sign in with your Adobe ID.

Sign in to Adobe Community

To post, reply, or follow discussions, please sign in with your Adobe ID.