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

Re: Advanced patch creation.

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Fri, 12 Mar 2010 23:20:04 +0000

On 12 March 2010 21:52, Todd Gleason <Todd.Gleason_at_elekta.com> wrote:
>> -----Original Message-----
>> From: Simon Large [mailto:simon.tortoisesvn_at_googlemail.com]
>> Sent: Thursday, March 11, 2010 2:41 AM
>> To: users_at_tortoisesvn.tigris.org
>> Subject: Re: Advanced patch creation.
>>
>> On 11 March 2010 07:21, Eyal Bar-lev <eyal.barlev_at_gmail.com> wrote:
>> > Hello.
>> > Great tool , first of all.
>> > Second:
>> > I would like to know :
>> > Is there a possibility to add an option to the patch creation dialog
>> to
>> > create a patch from a checked in version which is not necessarily the
>> last
>> > one ?
>> > For Instance :
>> > We checked in our project at version 1024.
>> > I split a branch for some development I need and checked in lots of
>> code,
>> > and now I am at version 1053
>> > I would like to create a patch which will reflect all differences as
>> of
>> > version 1041, for instance because the rest of the team has this
>> version of
>> > the branch. What I do today is to do a unified diff and then remove
>> all the
>> > absolute paths from there. Is there a way to integrate it to the
>> Patch
>> > creation tool, and add the version from which the diff was made as a
>> default
>> > to the file name of the patch ?
>>
>> Why don't you use merge for this instead of patch?
>
> Maybe you want to save the patch away for some time and for whatever reason don't want to commit it.  Or maybe you don't have access to Svn and need to send it to someone to submit at a later time, and they want to wait for approval (which could take days or weeks or more) before they even look at the patch file.

But the OP is asking for a diff between two already committed
revisions, which is different from the scenarios you are presenting.

It can be done - show log, select 2 revisions, show difference as
unified diff, save unified diff as - but why would you want to do that
in order to port changes from one branch to another. Unless the other
developers don't have read access to the branch that the patch is
created from. Merge is made for the job, patch is not.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2458918
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-03-13 00:20:05 CET

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