CVS Merging

Does anyone else use IDEA to merge from one branch into another?

I'm finding some weird behavoir. For example, in both the "Local Changes" and "Last Version" panes, I'm seeing CVS conflict marks like so:

}=======

Especially in the "Local Change" pane, occassionally at the end of the file I'll see:

>>>>>>> 1.2.8.2

Most certainly neither of these marks appear in the source code.

I love IDEA, but with CVS operations like this, I'm finding it wholly inadequete.

~ Keith

3 comments

Umm, those are conflict markers and are added by CVS itself.

You can use IntelliJ's merge tool to fix conflicts when they occur (it pops up automatically when a conflict is detected).

You must be hitting "Cancel" on the merge tool instead of resolving the conflict.

I hit Cancel but just because I like resolving conflicts by hand.

0

Gee thanks.

Yes, I know they are CVS conflict marks. No, I am not hitting "Cancel". These are what are displayed in either the right or left panes of IDEA's conflict resolution UI. Therefore, this indicates that IDEA believes that these marks are located in either my local copy of the file or within the repository's version. Since (1) I checked out a fresh version prior to merging and (2) I know no such marks are in the repository version, all clues point to an IDEA bug. More than likely, IDEA performs a "cvs update -j ", and incorrectly parses the conflict marks. It does not give me a lot of confidence in IDEA's merge ability as a whole. In addition to its one-file-at-a-time presentation of conflicts, this makes it a worthless tool for massive CVS merges.

~ kc

0

I'm using idea for cvs merging. I've put in an issue request to beef up the
cvs merging.

Anyway, I found I can do a merge for two branches relatively easy.

Sometimes though, I'm not looking for a merge, I'm looking for an overwrite
from one branch to the other.

Does anyone else use IDEA to merge from one branch into another?

I'm finding some weird behavoir. For example, in both the "Local
Changes" and "Last Version" panes, I'm seeing CVS conflict marks like
so:

}=======

Especially in the "Local Change" pane, occassionally at the end of the
file I'll see:

>>>>>>>> 1.2.8.2
>>>>>>>>

Most certainly neither of these marks appear in the source code.

I love IDEA, but with CVS operations like this, I'm finding it wholly
inadequete.

~ Keith



0

Please sign in to leave a comment.