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

Re: [TSVN] Hard time applying patches...

From: SteveKing <steveking_at_gmx.ch>
Date: 2005-03-23 17:12:35 CET

Lübbe Onken wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi Folks,
>
> I had a hard time applying Rainers patches for the German DUG (Thanks for
> your work Rainer!)
>
> The problem I ran into is that TortoiseMerge does not save/create the file
> when I do not apply the patch exactly from the patchfiles root.
>
> If you take the current example, Parent dir containing the patchfile is
> "doc"
> - ---SNIP---
> Index: source/de/tsvn_dug/dug_revgraph.xml
> ===================================================================
> - --- source/de/tsvn_dug/dug_revgraph.xml (revision 0)
> +++ source/de/tsvn_dug/dug_revgraph.xml (revision 0)
> - ---SNIP---
>
> I selected "apply patch" inside "doc/source/de" and loaded the patchfile
> "doc/tsvn_revgraph.diff". If I doubleclick the patch inside TortoiseSVN, the
> new file is created in the right hand window. Alas, there's no way to save
> it. The save button is enabled, but there's no warning, nothing.
>
> Only if I select "apply patch" inside "doc", where the patches root lies, it
> is possible to save the applied patch. This is a real "I'm stuck"
> experience, since it is not obvious, that the user made a mistake.
>
> I think this only happens, if the target does not yet exist. When the target
> exists, TortoiseSVN scans up the tree for the proper patch root.

Someone please file an issue about this.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Mar 23 17:15:57 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.