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

[TSVN] Re: Create list of patched files

From: Stefan Küng <stefan.kueng_at_wagner-group.ch>
Date: 2004-08-23 14:47:09 CEST

Jona wrote:

> Hi Stefan,
> I must apologize for writing you directly but I sent the following mail
> to the mailing lists a month or so ago and it has been blatantly ignored.

As far as I remember, I answered you on the list? Hmmm - maybe it got
lost somewhere in the electrical void ;)

> I've been searching far and wide for a feature which enables me to
> create a list of patched files.
>
> What I want to do is, once changes are commited to the repository,
> extract a list of changed files with their revision number in the
> repository in Unified Diff format.
> This functionality is similar to the Create Patch functionality already
> present with 2 differences:
> 1) The create patch option creates a Unified Diff file with the current
> revision number in the repository

Not quite correct: the "last commited" revision numbers found in the
working copy.

> 2) The create patch option writes the changes to be made to the current
> revision of the file in order to apply the patch

You mean the "apply patch" function? Yes, the patch is always applied to
the working copy.

> Doing it this way means that a user has to sort any conflicts every time
> the patch is applied using the Merge program.

But usually a patch only gets applied once.

> Seems to me that it would be prudent to be able to extract a list of
> changed files with their respective revision numbers in order to make a
> patch which would fetch the correct revision directly from the

You can create a patchfile with the revision numbers from the log
dialog. Just select the two revisions and then "show unified diff". Then
save the created tempfile in your text editor (which is started to show
the diff).

> repository and replace any existing files in the selected directory (a
> backup of the existing files would be nice here, I think, or a list
> which enabled de-patching directly from the repository)

> Furthermore, it seems that the current "apply patch" functionality
> expects the patch to be applied directly in the correct directory. That
> is, it doesn't appear to be possible to apply a patch to a top folder
> eventhough the path is clearly written in the generated Unified Diff file.

You can create a patch from the working copy root, and then you also
have to apply the patch on the working copy root. It's as simple as
that: apply it where you created it.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Aug 23 15:57:36 2004

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

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