CVS merge still doesn't work very well

Am I the only one seeing this kind of behaviour:
- when an "Update Project" results in multiple conflicted files, only
the first one is opened with the merge tool
- sometimes the "next conflict" and "previous conflict" buttons are
disabled in the merge tool, even when there are still conflicts to be
resolved
- on finishing a merge, I am told that my file has changed on disk and
in memory. Choosing "FS version" loses my merge changes, the only
sensible option is to choose "Memory version".

I haven't got access to a test CVS server to be able to play around
with, so I haven't been able to enter reproducible test cases (hence no
JIRA entries). Is anybody else seeing this, or have I just got something
weird in my set-up?

R

4 comments
Comment actions Permalink

Robert Gibson wrote:

Am I the only one seeing this kind of behaviour:
- when an "Update Project" results in multiple conflicted files, only
the first one is opened with the merge tool
- sometimes the "next conflict" and "previous conflict" buttons are
disabled in the merge tool, even when there are still conflicts to be
resolved
- on finishing a merge, I am told that my file has changed on disk and
in memory. Choosing "FS version" loses my merge changes, the only
sensible option is to choose "Memory version".

I haven't got access to a test CVS server to be able to play around
with, so I haven't been able to enter reproducible test cases (hence no
JIRA entries). Is anybody else seeing this, or have I just got something
weird in my set-up?


This has been reported before, but has supposedly been fixed in a recent
EAP build. In which build are you seeing this problem?

Ciao,
Gordon

--
Gordon Tyler (Software Developer)
Quest Software <http://www.quest.com/>
260 King Street East, Toronto, Ontario M5A 4L5, Canada
Voice: (416) 933-5046 | Fax: (416) 933-5001

0
Comment actions Permalink

Gordon Tyler wrote:

This has been reported before, but has supposedly been fixed in a recent
EAP build. In which build are you seeing this problem?

3408, haven't had any conflicts yet in 3415. Do you know which JIRA
tracker items are relevant?
R

0
Comment actions Permalink

Robert Gibson wrote:

3408, haven't had any conflicts yet in 3415. Do you know which JIRA
tracker items are relevant?


http://www.jetbrains.net/jira/browse/IDEADEV-1541

I haven't had to do any merges for a while, but I may need to do so in
the near future.

Ciao,
Gordon

--
Gordon Tyler (Software Developer)
Quest Software <http://www.quest.com/>
260 King Street East, Toronto, Ontario M5A 4L5, Canada
Voice: (416) 933-5046 | Fax: (416) 933-5001

0
Comment actions Permalink

I have the some problems with merging here too...
Don't know exactly what goes wrong and how to reproduce, but sometimes I
have this "huh-what-happened" feeling..


Johannes Schneider

Robert Gibson wrote:

Am I the only one seeing this kind of behaviour:
- when an "Update Project" results in multiple conflicted files, only
the first one is opened with the merge tool
- sometimes the "next conflict" and "previous conflict" buttons are
disabled in the merge tool, even when there are still conflicts to be
resolved
- on finishing a merge, I am told that my file has changed on disk and
in memory. Choosing "FS version" loses my merge changes, the only
sensible option is to choose "Memory version".

I haven't got access to a test CVS server to be able to play around
with, so I haven't been able to enter reproducible test cases (hence no
JIRA entries). Is anybody else seeing this, or have I just got something
weird in my set-up?

R

0

Please sign in to leave a comment.