Conflict editor not started in VS .NET

( CVSSCC )

Type: Public Status:Closed Created: 16 Jul 04 07:00 Updated: 14 Jan 05 01:00

--> Igor Pushkov (admin) at 14 Jan 05 01:00 writes

This is fixed in CVSSCC Proxy NT 2.0 (betta2). We are kindly ask to check
the issue. If it is still exist in new version reopen this ticket.

--> Stefan Ille (user) at 02 Aug 04 08:00 writes

Hello,
sorry for the delay, I've been out of office for holiday the last 2 weeks.

It simply makes no difference at all wether I check the "Launch conflict
editor..." option or not.
In any case I have a _real_ conflict and I get the standard CVS conflict
markers written in my source code instead of launching the conflict
editor.

The way to reproduce is:
Get a copy of the head revision.
Use checkout->advanced options for 'get latest', tag Merge->Megre with this
revision tag, select a branch and click OK. The branch is merged against
the trunc but as I said not by using the conflict editor but by writing the
CVS conflict markers directly in the source code.

Best regards
Stefan

--> Igor Pushkov (admin) at 21 Jul 04 07:00 writes

This is slightly strange, since if conflict really occurs you should
got it in "Conflict Editor". However, may be you "think" that there is
conflict, while this is not real conflict.
In plug-in we implement some functionality that change CVS behavior
"<<<<<<<<" into file. However we consider that this can make the file
broken, and for certain file types this is very critical (like the
solution file). So we implement chance to resolve conflict visually
without conflict markers.
This working fine, but taking into account your case (merging of
branches) I not 100% sure. May be really some bug there.
So, I ask you to:
1. If possible send to me sample project/repository with some
instruction how to repeat problem.
2. Or, which is much faster, switch off option "Launch conflict
editor...". This will disable our own conflict processing and you will
have the standard CVS conflict markers for conflicted file. If even in
this case you will not have conflict, you _really_ not have it. If
conflict occurs and you will see conflict markers it is our error. In
such case if you will be able to send example project this will be
very good.

--> Stefan Ille (user) at 16 Jul 04 07:00 writes

Hello,
I'm evaluating the Proxy because we like to swap from VSS to CVS.
I think I am missing something and perhaps you can give me a hint. When I
merge a branch into the head revision inside the VS.NET ide and there is a
conflict in merging I expected that the conflict editor should come up and
ask me to resolve the conflict. Instead the code lines causing the conflict
are directly written into my source files without the chance to resolve the
conflict.

Thank you
Best regards
Stefan

Rate this ticket:

Not useful at all

Partially useful

Useful

Very useful

Ticket

Conflict editor not started in VS .NET