[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Extended menu "Merge reintegrate"

From: Graham <Gbloice_at_gmail.com>
Date: Fri, 9 Jan 2009 02:33:25 -0800 (PST)

On Jan 8, 5:11 pm, Graham Bloice <gblo..._at_gmail.com> wrote:
> Can anyone explain how this is used?
>
> The help states that it's used to merge all changes from a feature branch
> back to trunk, but if I invoke it on a wc of my trunk I get an error "Unable
> to determine merge source".  If I invoke it on a wc of a branch it
> identifies the trunk as the merge source but doesn't merge any changes in.
>

Thanks for the replies about what "merge reintegrate" does, I already
know that and use it quite happily. I'm trying to find out about the
entry shown by TSVN in response to a Shift + Right Click on an item in
a right hand explorer pane, NOT the usual merge dialog.

The menu entry is titled "Merge reintegrate ..." and the resulting
dialog is titled "Merge all" with the merge options as shown on the
usual merge dialog after you've selected the merge source.

As you're not able to select a merge source I can't see how it can be
used to merge a branch back to the trunk, and indeed if you try the
menu option on a trunk wc this is what the error states, but it could
possibly be used to update a branch with all the missing commits from
the trunk as the branch does have the ancestry information required.

--
Graham
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1013513
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-09 11:33:57 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.