[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: Ben Voigt <richardvoigt_at_gmail.com>
Date: Thu, 8 Jan 2009 18:18:26 -0800 (PST)

On Jan 8, 11:11 am, 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.

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

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1012971

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-01-09 07:05:10 CET

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