| CVS Merge Problem [message #180735] |
Fri, 17 November 2006 05:58  |
Eclipse User |
|
|
|
Originally posted by: werner.hti-systems.co.za
Hi there,
If this is not the correct newsgroup for this I apologies.
I am migrating from JBuilder to Eclipse and am very impressed so far as
I've managed to overcome most of the learning curves of Eclipse.
One major thing that I can't seem to figure out and that is of huge
importance to me is a CVS merging problem that I am hopefully just
misunderstanding:
My project "Project1" that includes a class "Class1.java." has been
branched from "Branch1" to "Branch2" (when still using JBuilder). Then
after branching, I've added a line of code in "Class1.java" on "Branch1".
Then after starting to use Eclipse, it was time to merge "Branch1" into
"Branch2". Most of the changes was merged successfully (i think) but not
the change in "Class1.java". The synchronizing perspective of Eclipse
correctly identifies that there is a change in "Class1.java" between
"Branch1" and "Branch2", BUT it shows the change being in the wrong
direction! I.e. it shows the change was made by removing the line of code
from "Branch2" when in fact it never existed in "Branch2" at all! So the
automatic merging of non conflicting changes does not merge this change
because it thinks it is in the other direction.
Very surprised about this I've tried using JBuilder's merge functionality
to merge this "Branch1" into "Branch2" and it merged this change in
"Class1.java" perfectly as expected.
This is the only thing keeping me from suggesting Eclipse as the platform
of choice for our organization as the CVS merging functionality is an
integral part of our development.
Any ideas will be appreciated.
Thank you,
Werner Kok
|
|
|
| Re: CVS Merge Problem [message #180789 is a reply to message #180735] |
Fri, 17 November 2006 17:54  |
| Eclipse User |
|
|
|
Originally posted by: eclipse4.rizzoweb.com
Werner Kok wrote:
> Hi there,
>
> If this is not the correct newsgroup for this I apologies.
>
> I am migrating from JBuilder to Eclipse and am very impressed so far as
> I've managed to overcome most of the learning curves of Eclipse.
>
> One major thing that I can't seem to figure out and that is of huge
> importance to me is a CVS merging problem that I am hopefully just
> misunderstanding:
>
> My project "Project1" that includes a class "Class1.java." has been
> branched from "Branch1" to "Branch2" (when still using JBuilder). Then
> after branching, I've added a line of code in "Class1.java" on
> "Branch1". Then after starting to use Eclipse, it was time to merge
> "Branch1" into "Branch2". Most of the changes was merged successfully (i
> think) but not the change in "Class1.java". The synchronizing
> perspective of Eclipse correctly identifies that there is a change in
> "Class1.java" between "Branch1" and "Branch2", BUT it shows the change
> being in the wrong direction! I.e. it shows the change was made by
> removing the line of code from "Branch2" when in fact it never existed
> in "Branch2" at all! So the automatic merging of non conflicting changes
> does not merge this change because it thinks it is in the other direction.
When you moved over to using Eclipse, did you check out a new copy of
the project from CVS just for Eclipse, or re-use what you already had
checked out for JBuilder? On which branch did you initially work in
Eclipse? On what branch is your Eclipse project now?
I suspect this is some one-off result of the fact that you moved to
Eclipse in between branches. Eclipse CVS merging (with Synchronize view)
is by-far the smoothest, most intuitive I've used. Even if the answers
to the questions above don't get us to an explanation, I encourage you
to do some other branching and merging with Eclipse to get an idea of
how it works. I used to dread having to do large merges with CVS, but
since using Eclipse my attitude has completely changed - I even use
branches much more liberally now that I have what I consider a great
tool to support me.
Hope this helps,
Eric
|
|
|
Powered by
FUDForum. Page generated in 0.07604 seconds
] 
Search
Help
Register
Login
Home
