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

Patch within branch

From: Kerry Carroll <carrolky_at_alumni.uc.edu>
Date: Fri, 14 Nov 2008 07:58:26 -0500

Hi all,

I appended this question within a reply to an earlier post but then decided
it deserved it's own thread.

I have a patch (actually 2 different patches) that I use to maintain the
differences between 3 separate installations of the same product. I came
across an issue recently wherein I discovered that if I update the patch
file in a branch and then merge everything back to the trunk, and make a
change to my application in the trunk, I'm unable to apply the patch. I
receive an error indicating that the patch seems out dated. I was able to
merge my changes back to the branch and then apply the patch. There was a
conflict which I needed to resolve but this was expected.

I don't want to lose the ability to apply a patch after the changes have
been merged back to the trunk and the branch is blown away.

Can someone help me better understand why the patch is dependent on the
branch? Is this a bug?

-- 
Kerry Carroll
carrolky_at_alumni.uc.edu
Received on 2008-11-14 13:58:41 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.