Empty error message dialog in TortoiseMerge

[Chris Smith]

One of our developers has come across an issue when trying to apply a patch with TortoiseMerge.

When TortoiseMerge is launched after using the Apply Patch option in the explorer context menu, it starts up TortoiseMerge and immediate displays and empty error message box (see attachment). As you can imagine, this isn't all that helpful :-)

I've tried to create a stand alone test case for this but I cannot get it to fail in this way. I can't reveal our WC or source either unfortunately.

It occurs on two separate computers from clean check outs. Both are Windows 7 X64, using TSVN 1.7.9 X64.

The scenario is creating a patch from one feature branch and applying to another feature branch.

I'll provide any info that I can on request.

Any help appreciated.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3004808

To unsubscribe from this discussion, e-mail: [dev-uns...@tortoisesvn.tigris.org].

[Stefan Küng]

On 10.09.2012 17:29, Chris Smith wrote:
> One of our developers has come across an issue when trying to apply a patch with TortoiseMerge.
>
> When TortoiseMerge is launched after using the Apply Patch option in the explorer context menu, it starts up TortoiseMerge and immediate displays and empty error message box (see attachment). As you can imagine, this isn't all that helpful :-)
>
> I've tried to create a stand alone test case for this but I cannot get it to fail in this way. I can't reveal our WC or source either unfortunately.
>
> It occurs on two separate computers from clean check outs. Both are Windows 7 X64, using TSVN 1.7.9 X64.
>
> The scenario is creating a patch from one feature branch and applying to another feature branch.
>
> I'll provide any info that I can on request.

The empty error message when applying a patch is fixed on trunk.
However it only shows up if:
* the patch file is empty (or is invalid so the patch data appears to be
empty)
* the patch is not applied to the correct directory (auto-dir-search
works on trunk now)
* the patch file uses absolute paths instead of relative ones (trunk
already strips such paths automatically)

Stefan

--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3005335

[Chris Smith]

Thanks for your reply. That's all cool and makes sense. I'll test our case against the next release and post back if I experience any more problems.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3005593