[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-03 11:15:44 CEST

Stefan Küng wrote:

>On 10/3/05, Peter McNab <mcnab_p@melbpc.org.au> wrote:
>
>
>
>>Creating a patch from local uncommitted changes including added but not
>>yet committed folders and files produces the dialog with a checkbox list
>>of all the files and their paths as expected.
>>However when the tool runs and creates the actual patch file, the ticked
>>new added folders and their files are missing from the output.
>>
>>Is this expected behavior or a problem to be solved or documented?
>>
>>
I forgot to add, or me be better educated but that's the most difficult
outcome.

>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.
>
>Stefan
>
>
Ah ha!.
So, it becomes a two step process to "upgrade" a project tree.
1. Upload and add the new folders and files to the project tree.
2. Apply the patch which links in the new files.

Can I see the reflection of a red face in the monitor?
Re-read the svn dos and came across:-
"The file format used by *patch* is quite limited; it's only able to
tweak file contents. There's no way to represent changes to /trees/,
such as the addition, removal, or renaming of files and directories"

Thanks

Peter

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Oct 3 11:16:06 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.