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

Re: [TSVN] Patch tool not including new file in added folder

From: Peter McNab <mcnab_p_at_melbpc.org.au>
Date: 2005-10-04 08:02:18 CEST

Simon Large wrote:

> Stefan Küng wrote:
>
>> On 10/3/05, Simon Large <simon@skirridsystems.co.uk> wrote:
>>
>>> Stefan Küng wrote:
>>>
>>>> Not expected, but also not TSVN's fault.
>>>> Try it with the CL client - it won't show the diff of files within
>>>> added folders either. And that's because the unified diff doesn't know
>>>> about folders, only files. And added files within unsupported added
>>>> folders can't be created because the folder isn't created/added
>>>> either.
>>>
>>>
>>> As there's nothing we can do about this, should we show a warning when
>>> someone tries to create a patch which adds folders?
>>
>>
>>
>> PFAI!
>> (means: please file an issue)
>
>
> Filed as issue 175.
>
> Simon
>
OK. So I asked the question on the dev@subversion list because I cannot
imagine contributors to a project don't ever provide code which doesn't
add folders and new files, and I simply wanted to know how that's done
if patch files alone are insufficient.

The short answer from John Peacock is a bit at odds with the Subversion
documentation and is as follows
>
> [this is really a users@ question]
>
> The patch file format has no problem with directory/file additions.
It cannot handle renames or directory deletes,
> however. If you really need that, you can use SVK:
>
> http://svk.elixus.org
>
> which includes a binary block to a conventional diff file (which
patch helpfully ignores) which can contain more
> complex tree operations.
>
> John

Jonh's answer is sort of what I expected a patch tool should do, so the
svn documentation might be short of the mark on information.

Back to TSVN.
TSVN displayed the added folders and files with tick boxes and one is
clearly misled because what is displayed as selected for inclusion in
the patch is not what you actually get in the patch file.
Issue 175 thanks Simon.
However, we have conflicting views about whether the patch tool can add
new folders and files so, if to can, as I think it should, then can TSVN
be updated to perform the actions it's dialog implies to the user rather
than crippling it. If of course the patch format supports folder/files
addition.

What brought this is that I was preparing a patch of my contribution to
another Open Source project (DUnit) and it failed in a pre release trial
because files were missing without me knowing.

Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Oct 4 08:02:38 2005

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.