Well, I don't have time to go into gory detail, so I suggest reading the book URL below. If you prefer a single HTML page so you don't have to click through lots of individual pages, this URL will also jump you to that chapter:
http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge
When you create a branch, it happens via an `svn copy` command, which not only
makes the copy, but also sets some invisible properties on the branch, so SVN
can tell where (and when) it was copied from. As development proceeds on both
the trunk and the branch, you can "pull" updates from the trunk (origin) to the
branch by calling `svn merge` from the branch. If there are any conflicts (such
as file segments that were modified in both trunk and branch) they need to be
resolved manually. If both trunk and branch are fairly active, it's a good idea
to merge from trunk to branch regularly to minimize conflicts and become aware
of them earlier. When you want to migrate changes made in the branch back to
the branch, you use `svn merge --reintegrate`, with the last option signifying
you're going in the opposite direction, back to the source.
NOTE: The invisible property I'm talking about is called svn:mergeinfo, and is
maintained automatically when you're using SVN 1.5+. You can view this
information directly via `svn propget svn:mergeinfo path`, or use the `svn
mergeinfo URL` command. It's also described in the book.
Hope that helps,
- Quinn
On May 24, 2010, at 7:17 AM, james wrote:
> Thanks for the post Quinn, I am however completely lost!
>
> I have a Branch 'sandbox' which is sitting at revision 251 and the
> trunk (which has has a couple of changes since checkout of sandbox) is
> 247, any help on this would be great, did manage to run a diff via
> terminal, but still completely lost...
>
>
> On May 12, 5:27 pm, Quinn Taylor <[email protected]> wrote:
>> From Terminal, you'll want to look at using `svn merge --
>> reintegrate ...` — you can find more detail by typing `svn help
>> merge`. This assumes you're using SVN 1.5+. Also check out the SVN
>> book parts on merging.
>>
>> http://svnbook.red-bean.com/en/1.5/svn.branchmerge.html
>>
>> - Quinn
>>
>> On May 12, 2010, at 8:44 AM, james wrote:
>>
>>> Ok so I have read a lo about how merge isn't (yet) within Version, but
>>> I have created a brach from the main trunk which i'm using as a
>>> sandbox, to check and develop a site with, then once happy I wanted to
>>> drop everything onto the trunk. Seeing as this is not with-in versions
>>> how can I go about getting this done?
smime.p7s
Description: S/MIME cryptographic signature
