Hi Stefan,
When using the 'Apply Patch...' context menu of the 'contrib' folder to apply
the patch at the bottom of this message, a new file
called 'contrib\Utils\NewDoc.txt' is created. Unfortunately, the file is
empty! If you close TMerge and apply the patch a second time, then the file
gets its contents filled in.
The patch file was created by checking out the contrib folder,
creating 'contrib\Utils\NewDoc.txt', adding it to Subversion control, and then
using the 'Create Patch...' context menu command on the 'contrib' folder. I
would suggest that this implies that when the patch is applied, the new file
should also be added to Subversion.
I'm using the latest nightly build (r2025).
TTFN,
Damian.
-------------
Damian Powell
[w] http://www.shadow-angel.com/
----- PATCH BELOW THIS LINE -----
Index: Utils/NewDoc.txt
===================================================================
--- Utils/NewDoc.txt (revision 0)
+++ Utils/NewDoc.txt (revision 0)
@@ -0,0 +1,2 @@
+This is a new document but you probably won't be able to read this unless you
+look directly at the patch file!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Dec 2 14:33:49 2004