[#IDEADEV-13642] CVS Conflict Merge is confusing

IDEA: Development

CVS Conflict Merge is confusing

Created: 03 Aug 06 15:03 Updated: 04 Aug 08 11:50

Component/s:

Diff/Merge

Fix Version/s:

Diana 8650

Original Estimate:

Unknown

Remaining Estimate:

Unknown

Time Spent:

Unknown

Build:	5,561
Fixed in build:	8,647

Description

« Hide

I think it may be a bug but I'm not positive. When there is a conflict in my file when I do cvs merge, it will show up 3 boxes. The left should show my local code, the right is the one in the repository and the middle is the merge version. But sometimes, it's not like that. I found once that the middle one is my local version and the left is the one that has conflict in there (I mean the one with <<<<<<<< blablabla >>>>>>>>>>> tag)

All

Comments

Work Log

Change History

Sort Order:

[ Permlink | « Hide ]

Dmitry Jemerov - 15 Sep 06 19:32

Do you have any idea when exactly this happens? Do you use tags or branches in your CVS project?

[ Permlink | « Hide ]

Nat - 04 Nov 06 17:35

It happens when I use "cvs update" with option to merge changes from the other branches. When there are cvs conflict, all 3 windows will often show the same document instead of showing the conflicts

[ Permlink | « Hide ]

Irina Petrovskaya - 23 Jan 07 10:46

i get this problem while performing cvs update with merging with branch, if there are few files with conflicting changes.
For example, i have 3 files with local version = head version = 1.10, 1.12 etc and branch versions 1.6.4, 1.6.5 etc
after update project invocation i get the real smash in the merge dialog panes (usually not for the first file opened in merge, but sometimes in the first one also)

[ Permlink | « Hide ]

Jason Rasmussen - 08 May 07 19:04

I get this anytime I do a CVS update, and there is a merge with conflict. The right and left sides are identical, and the middle looks like the last version from CVS. If I hit the "<<" on the right pane (the pane labeled "Last Version"), it will use my local copy. If I hit the ">>" on the left pane (the pane labeled "Local Copy"), it will use my local copy as well. If I hit the "x" on the left pane, then it will use the last version from CVS, which is what was already showing in the middle. This happens every time there is a conflict, even without branches. I can grab a screenshot next time I get a merge with conflict.

[ Permlink | « Hide ]

Simon Dyson - 01 Aug 07 17:43

Although I didn't make a note of the exact details I do recall this happening to me when doing an "integrate" to merge an SVN branch onto the trunk. I think the left and right side had been switched (or at least the labels were the wrong way round)

[ Permlink | « Hide ]

Dong Lee - 15 Apr 08 20:14

I'm using build 7757 and every time I have a merging conflict the local changes, merge result, and changes from server windows show the same document. This happens when there is a conflict merging a CVS branch with the trunk. I do not remember this happening to me with versions 5 and 6.

any idea when this will be addressed? this is causing problems for us when we do production fixes. I contacted support but was directed here...

[ Permlink | « Hide ]

Irina Chernushina - 04 Aug 08 11:50

seems duplicate to ~~IDEADEV-28781~~