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

[TSVN] Hard time applying patches...

From: Lübbe Onken <l.onken_at_rac.de>
Date: 2005-03-23 09:34:21 CET

-----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.

Cheers
- - Lübbe

- --
       ___
  oo // \\ "De Chelonian Mobile"
 (_,\/ \_/ \ TortoiseSVN
   \ \_/_\_/> The coolest Interface to (Sub)Version Control
   /_/ \_\ http://tortoisesvn.tigris.org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (MingW32)
Comment: GnuPT 2.6.0

iD8DBQFCQSoMm8gezyP1EasRAhTJAJ0bbVz82G8NIwT6/xqywykinTC/qwCgi54U
JwO7cP9qEuxcHO+DqzFPWwA=
=8+tA
-----END PGP SIGNATURE-----

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Mar 23 09:35:08 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.