On Mon, May 13, 2013 at 1:10 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 13.05.2013 18:45, Ben Fritz wrote:
>> I have a patch I created from the "check for modifications" dialog
>> prior to reverting changes I did not wish to commit before doing a
>> merge.
>>
>> On a different branch, I tried applying the patch by right-clicking on
>> it and choosing TortoiseSVN->"Apply patch..."
>>
>> The TortoiseMerge window pops up with no content on either side.
>> Nothing else seems to happen.
>>
>> Exiting the TortoiseMerge window, I do a "Check for modifications" an
>> no files have changed.
>>
>
> Works fine for me here.
> What version of TSVN are you using?
>
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.
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.
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:
trunk_checkout
↳subdir_1
|↳file_1
|↳sub_sub_dir
| ↳file_2
↳subdir_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.
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.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3055443
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-13 21:24:57 CEST