Hey Derek, On Thu, 2006-10-26 at 03:30 -0500, Derek Anderson 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...
Subversion merging isn't that different from CVS merging: you have to tell it where to start (and, optionally, stop) merging. In subversion, since revision numbers are global (they account for commits to all branches), you can use the revision numbers to specify a point on a branch. A good reference on the web (or in paperback) for svn commands is http://svnbook.red-bean.com/ (there are a number of versions depending on the version of svn you are using, but for the most part, the commands are the same). At http://svnbook.red-bean.com/en/1.2/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.wholebr is a fairly good description for branch merging. However, stay awake as read that page, since their example if for merging a development branch into trunk (you are going in the other direction). The general ideas behind subversion's merge design are at http://svnbook.red-bean.com/en/1.2/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.bestprac which is worth reading, because it explains --dry-run and how to resolve conflicts. Merging two branches really comes down to working out the revision numbers you are merging between and the direction, doing the merge and then committing back the changes. If you are still stuck after reading through the above examples, by all means post again and we can try to break down the problems. Regards, Malcolm > > > > 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 -~----------~----~----~----~------~----~------~--~---
