[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: Judson Wilson <judson_at_powerstandards.com>
Date: Tue, 18 Jan 2011 14:28:57 -0800

Ah, that is an interesting idea. Patch the base revision of the patch,
then update/switch may way over to the branch. I think this might work
quite well.

On 1/18/2011 7:35 AM, Bob Archer wrote:
>> Hello, first of all I would like to say that I love tortoise SVN,
>> great job!
>> 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"
>> 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.
>> Curious to hear some thoughts on this subject.
> I think you can "Update to revision" that the patch was made from, apply the patch, then do an update, resolving any conflicts and commit.
> BOb
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2698898
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-01-18 23:29:11 CET

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