On 13.05.2013 21:24, Ben Fritz wrote:
> TortoiseSVN 1.7.12, Build 24070 - 64 Bit , 2013/03/29 08:00:43
> Subversion 1.7.9,
> apr 1.4.6
> apr-utils 1.3.12
> neon 0.29.6
> OpenSSL 1.0.1e 11 Feb 2013
> zlib 1.2.7
> More info:
> The patched files are all under a single subdirectory tree of my trunk.
> When I create the patch from the "check for modifications" dialog, even if
> I start the dialog from the trunk directory, the created patch file does
> not contain the first subdirectory for some reason.
The patch is created from the common root of all selected items, in this
case the second subdirectory.
> When applying this patch from the trunk directory, the apply patch process
> searches for and finds the correct subdirectory to apply the patch to. It
> asks whether to use it and I answer "Yes". But the merge window still
> comes up blank.
Are you sure it finds the right subdirectory?
> If I create the patch instead by right-clicking on the trunk directory and
> choosing "create patch" from the TortoiseSVN context menu, the generated
> patch file DOES contain the subdirectory tree containing the modified
> files. Applying this patch via the "Apply Patch..." menu entry DOES work.
> The two patches are otherwise identical.
> Here it is visually in case my description isn't clear:
> | ↳file_2
> Files file_1 and file_2 are modified. If I right-click on trunk_checkout
> or subdir_1 and choose "check for modifications", then select and
> right-click on the modified files within this dialog to create the patch,
> I get a patchfile with file paths "file_1" and "sub_sub_dir/file_2". This
> patch only applies with the command-line tool.
Tried this, and I can apply such a patch with TMerge without any
problems. Even though the patchfile only contains the paths "file_1" and
> If I instead right-click on trunk_checkout and choose "Create Patch"
> rather than "check for modifications", the paths in the patch file are
> "subdir_1/file1" and "subdir_1/sub_sub_dir/file_2" and the patch can apply
> successfully with TortoiseSVN.
I've used a test working copy for this, using names "subdir1",
"subdir2", "subsubdir1", "file1" and "file2".
If you're sure that TMerge finds the correct path (hover the mouse
pointer over the files in the patch file list in TMerge to see the full
path), then maybe your paths have special chars in them? Or something
else is different?
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-14 20:29:26 CEST