On Tue, May 14, 2013 at 1:29 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
>> 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.
>
> 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
> "subsubdir/file_2".
>
>> 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?
>
TMerge didn't have any file list, it came up empty.
Rather than figuring out what's missing from my repository
description, I created a simple test repository.
Examine the attached file then rename it to a .bat extension. Running
it will set up a repository and working copy which demonstrates the
problem.
After the script runs you should have an explorer window in the br1
branch. Do "check for modifications" and create a patch from both
files.
On applying this patch in the "br2" branch, the TMerge window comes up
blank, with no file list.
Go back to the br1 branch, and this time do "create patch" from the
top-level TSVN menu. Copy this patch to the "br2" branch and apply.
File list is populated and I can "patch all items" to apply the patch
with no problems.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3055616
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-05-15 19:14:53 CEST