Terry Rosenbaum wrote:
> Hi,
>
> Short story:
>
> In 1.3.1 and 1.4.0 I'm seeing this behavior in TortoiseMerge:
>
> - BUG: After a merge which produced conflicts, the context menu wasn't
> shown with the entries to resolve the conflict. (Stefan)
>
> Is it still a bug?
>
> Details:
>
> I've tried both the latest released build 1.3.1 and
> the nightly build:
>
> TortoiseMerge 1.4.0, Build 5828 - 32 Bit -dev
> libsvn_diff 1.3.0,
> apr 0.9.7
> apr-iconv 0.9.7
> apr-utils 0.9.7
>
> Running on Win2K Server + SP4.
>
> Installed via .msi package.
>
> I have a conflicted file. Through the context menu in Explorer (yes,
> that works fine)
> I launched Merge ("Edit Conflicts...").
>
> I went to the conflicted lines and selected them in the bottom pane
> (3-pane view).
> Regardless of whether or not I selected the lines with the left mouse
> button first,
> the right mouse button will not bring up a resolution menu. Since the
> lines are conflicted,
> I expect that right mouse will open the context menu.
>
> The behavior is the same for me in 1.3.1 and 1.4.0. The only difference
> I noticed between the 1.3.1 Merge and the 1.4.0 Merge is that for the
> same file, in 1.3.1 the "Next Conflict"/"Previous Conflict" buttons on the
> top menu bar are enabled whereas in 1.4.0 both of those buttons are
> grayed out.
>
> Any idea of whether the context menu problem is a bug or is this
> something I'm doing wrong?
Can you send me the conflicted files? I can't reproduce that here. If I
open the three files "Schillers Glocke" from our test folder
(http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/test/mergediff), go
to the conflicted lines, right-click, I can see the context menu just fine.
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Fri Feb 24 21:14:48 2006