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

Re: Question about applying patches

From: Duncan Murdoch <murdoch.duncan_at_gmail.com>
Date: Tue, 24 Jun 2014 16:26:40 +0200

On 24/06/2014, 3:59 PM, Bob Archer wrote:
>> On 24/06/2014, 10:02 AM, Simon Large wrote:
>>> On 24 June 2014 04:37, Duncan Murdoch <murdoch.duncan_at_gmail.com>
>> wrote:
>>>> I'm working on a project (R) with a number of other people. We
>>>> generally don't like to have things committed to the trunk until they
>>>> are ready to go, passing tests, etc. This means development of
>>>> changes that take several days can be a little tricky.
>>>>
>>>> I think the official svn way to do it is by branching, but the
>>>> trouble with that is that merging other people's trunk changes into
>>>> the branch can be tricky unless done very frequently, and it's a lot
>>>> of work if done frequently.
>>>>
>>>> What I've been doing instead is saving patches of my changes, then
>>>> reverting, updating the trunk, and re-applying the patch. This seems
>>>> easier.
>>>
>>> Huh? Why would you do that? Create patch/revert/update/apply patch is
>>> exactly the same as just updating your changed working copy, and a lot
>>> more error-prone. That is the whole point of update - to merge trunk
>>> changes into your own possibly modified working copy.
>>
>> The problem is when the change takes a few days to complete, and I need a
>> clean working copy for other purposes before it's done, e.g. if someone tells
>> me about an unrelated bug that needs fixing urgently.
>
> So, just do another checkout.

See the paragraph below.

Duncan Murdoch
>
>
>
>>
>> A different strategy would be to make a copy of the whole working copy and
>> work there, but unlike branching or my strategy, that doesn't allow
>> intermediate steps to be saved, or easily allow the work to be continued on a
>> different computer from the one where I started. I find it's also error prone
>> to have multiple nearly identical source trees on the disk:
>> I can easily find myself writing changes to the wrong one.
>>
>> Duncan Murdoch
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3083819
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
>

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-06-24 16:26:53 CEST

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