Julian Foad wrote:
> The standard way to do this is "svn merge ^/trunk" on this branch.
>
> As it has been six months without a catch-up, this merge is likely to
> produce quite a few conflicts. If the conflicts are difficult to
> resolve, you can revert the attempt and instead merge the changes in
> smaller batches, such as:
>
> svn merge ^/trunk_at_37500
> <resolve>
> svn ci -m "On the issue-3390-dev branch: catch up with trunk_at_37500."
>
> svn merge ^/trunk_at_38000
> <resolve>
> svn ci -m "On the issue-3390-dev branch: catch up with trunk_at_38000."
>
> svn merge ^/trunk
> <resolve>
> svn ci -m "On the issue-3390-dev branch: catch up with trunk."
>
> Or, as there are only two changes on the original branch, an alternative
> and probably quicker way would be to delete the branch, re-create it
> from latest trunk, and then merge the original branch changes (r37080,
> r37644) into it.
>
Thanks Julian. Reading the hacking.html file, I noticed that it stated
along the lines that the branches (esp. experimental ones) can be
committed by anyone. Is this the case here, or do I need some sort
of committing permission set? Or did I read wrong?
Edmund
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=2403918
Received on 2009-10-06 02:17:34 CEST