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

Re: Bug/Feature Request - Patching across branches?

From: Dale McCoy <dalestan_at_gmail.com>
Date: Tue, 18 Jan 2011 08:12:55 -0500

> One particularly annoying problem I see over and over occurs when
> someone creates a patch in a branch, and then I try to apply it to the
> trunk, or another branch. TortoiseSVN can't seem to track the changes
> going back to the branch point and forward to the checked out copy. It
> complains that "This patch seems outdated"

TortoiseSVN will only reliably apply a patch to the file against which
the patch was taken, or (I believe) any of that file's descendants.
Siblings/cousins of the original file are unlikely to work. If you
must apply a patch to a file from which it was not taken, do so with a
command-line patch tool.

> It seems to me that the pieces of functionality already exist, because
> the merge function (Merge Range of Revisions) has most of the
> functionality needed in there.

But the better solution is to use the above-mentioned merging, because
that makes helpful things like merge tracking work.

Dale McCoy

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-01-18 14:13:03 CET

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