Login | Register
My pages Projects Community openCollabNet

Discussions > users > Re: Extended menu "Merge reintegrate"

Project highlights: :. Download .: :. Support .: :. FAQ .: :. Translations .: :. Donate .: :. Report Bug .:

tortoisesvn
Discussion topic

Hide all messages in topic

All messages in topic

Re: Extended menu "Merge reintegrate"

Author Graham <Gbloice at gmail dot com>
Full name Graham <Gbloice at gmail dot com>
Date 2009-01-09 02:33:26 PST
Message On Jan 8, 5:11 pm, Graham Bloice <gblo...@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

Re: Extended menu "Merge reintegrate"

Author kkolinko
Full name Konstantin Kolinko
Date 2009-01-08 18:45:19 PST
Message 2009/1/8 Graham Bloice <gbloice at gmail dot com>:
> 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.
>

Read the following blog entry by Mark Phippard. It explains a lot:

http://blogs.open.co​llab.net/svn/2008/07​/subversion-merg.htm​l

Best regards,
Konstantin Kolinko

Re: Extended menu "Merge reintegrate"

Author Ben Voigt <richardvoigt at gmail dot com>
Full name Ben Voigt <richardvoigt at gmail dot com>
Date 2009-01-08 18:18:27 PST
Message On Jan 8, 11:11 am, Graham Bloice <gblo...@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.

For this you need three components to be (at least) SVN 1.5.x:

The server
The repository database format
The client

It sounds like the last one is ok but one of the first two is too old.

>
> --
> Regards,
>
> Graham

Re: Extended menu "Merge reintegrate"

Author rocksun
Full name Rock Sun
Date 2009-01-08 17:55:15 PST
Message
Attachments

Extended menu "Merge reintegrate"

Author "Graham Bloice" <gbloice at gmail dot com>
Full name "Graham Bloice" <gbloice at gmail dot com>
Date 2009-01-08 09:11:14 PST
Message
Attachments
Messages per page: