Skip to main content
Known Participant
September 22, 2009
Question

Good Tutorial on SVN Sandbox

  • September 22, 2009
  • 1 reply
  • 1297 views

Hey there,

I have been working on using the SVN Sandbox, but merging has been a real problem.  Could one of you please describe how you merge your branches with the trunk in all its detail?

This is what I do:

svn update # to see if I need the latest changes

svn merge -r 10505:HEAD http://opensource.adobe.com/svn/opensource/flex/sdk/trunk .

svn commit

The problems are:

1) "update" doesn't get any files that aren't already there, so when the trunk adds or switches around files, I can never easily merge them onto my desktop branch.

2) If I run the merge command on the Sandbox tutorial page (svn merge trunk local), it doesn't really do anything.

3) I have to manually keep track of my last merge which is difficult because I often run into problems

Currently, I can't really easily have my own sandbox.

If you guys could quickly outline the steps you take, and maybe how to overcome common issues, please let me know.

Thanks so much,

Lance

This topic has been closed for replies.

1 reply

viatroposAuthor
Known Participant
September 22, 2009

oops I meant (svn merge trunk sandbox), not (svn merge trunk local)