Hi Derek, To do the merge you need to look at the last revision that you merged from trunk or in your case when your branch was created. In this case it is revision 3332. So to merge the latest trunk you need to:
cd django_tmp_src svn merge -r 3332:HEAD http://code.djangoproject.com/svn/django/trunk [resolve and conflicts and test your code] svn co -m 'merged latest changes from trunk' To keep up to date with the trunk you just need to run an 'svn log' in your working copy and look at the last revision that you merged from the trunk, rev xyz say, and use that like this: svn merge -r xyz:HEAD http://code.djangoproject.com/svn/django/trunk etc regards matthew On 26/10/06, Derek Anderson <[EMAIL PROTECTED]> wrote: > > "svn merge http://code.djangoproject.com/svn/django/trunk"; gives me the > "svn help merge" message. > > here's what i did: > > $ svn co > http://code.djangoproject.com/svn/django/branches/schema-evolution/ > django_tmp_src > [normal checkout crap] > > $ cd django_tmp_src/ > > $ svn merge http://code.djangoproject.com/svn/django/trunk > [help message] > > > god i miss cvs... > > > > Kenneth Gonsalves wrote: > > > > On 26-Oct-06, at 12:40 PM, Derek Anderson wrote: > > > >> can someone who knows svn better than i help me out as to how i would > >> refresh the branch with the latest from the trunk, and then remerge > >> these changes back into it? > > > > in your working copy root do: > > > > svn merge http://code.djangoproject.com/svn/django/trunk > > > > and then, after resolving conflicts do > > > > svn commit > > > > > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Django developers" group. To post to this group, send email to django-developers@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/django-developers -~----------~----~----~----~------~----~------~--~---
