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

Re: Creating a patch file from a past revision

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 26 Jun 2009 19:02:19 +0200

Martin Bischoff wrote:
> On Fri, Jun 26, 2009 at 18:34, Stefan Küng <tortoisesvn_at_gmail.com
> <mailto:tortoisesvn_at_gmail.com>> wrote:
>
> Martin Bischoff wrote:
> > Hi everyone,
> > is it possible to create a patch file from an old revision (e.g. from
> > the "Show Log" window)?
> >
> > I'd like to apply changes that were made some time ago to a
> working copy
> > (that is based on a different repository). I have read the help file,
> > but it only explains how to create a patch from the local changes in a
> > working copy.
>
> Select the revision in the log dialog, right-click, choose "show changes
> as unified diff". The 'patch' (a patch is just a unified diff file) will
> open in your default text editor or the patch viewer you've configured
> in the TSVN settings dialog.
> Save that unified diff to a file and you have your patch.
>
> Stefan
>
>
> Thanks!
> I guess this was a stupid question, because I can simply merge a
> revision from the repository into my working copy (even if the working
> copy is based on a different repository).

But if you use merge, and your working copy is from a different
repository, make sure you check the box "ignore ancestry". And you then
should remove all svn:mergeinfo properties that might get set during the
merge before you commit that change - there shouldn't be any, but non
the less you should check that first.

Stefan

-- 
       ___
  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=2365784
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-06-26 19:02:48 CEST

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