Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » Subversive » The merge conflicts that aren't...(Subversive shows false merge conflicts)
The merge conflicts that aren't... [message #539018] Wed, 09 June 2010 11:01 Go to next message
David Butenhof is currently offline David Butenhof
Messages: 1
Registered: July 2009
Junior Member
After several unsuccessful tries at updating to SVNKit 1.3.2, I was finally able to get it to work with Subversive 0.7.9. (Our project standard development environment had been updated to native SVN client 1.6.9, so effectively moving my Eclipse SVN client from 1.6.2 to 1.6.6 seemed appropriate.)

The problem is that since that update, normal merge seems to be completely messed up graphically. As I haven't been able to find any other mention of this fairly glaring symptom, I'm assuming there's something odd about my environment and I'm "unique"... but perhaps someone has some ideas.

I work in a branch copied off of the project trunk. I make changes in the branch. Now, I merge the head of trunk onto my branch using Subversive (default "Start from Copy" range). I get the synchronize view showing all the files changed in both streams. Normally, I have only had to deal with a list of incoming changes, with perhaps one or two files marked as conflicts, with the red "double diamond" icon and "[conflicting change]" annotation on the file name.

Now, every file that has changed on either side is marked as a conflict, every time I merge, even when there are no "*.merge*" files anywhere in the tree. When there are, so far as I can see searching for them myself from a shell window is the only easy way to find which files really do have conflicts. (I can try to commit, sort the state column, and look for "Conflict"... it knows the truth; but doing a shell 'find' is usually easier, especially if there are a lot of files in the merge.)

When there are no real merge conflicts, I can just commit the merge with no problem. As I said, the commit dialog shows the correct file status. In other words, I don't think that Subversive really believes there are conflicts; it's just annotating the files in the synchronize view incorrectly.

Any ideas?

SVNKit 1.3.2 Implementation 2.2.2.I20100512.190
Subversive SVN connectors 2.2.2.I20100512.190
Subversive implementation 0.7.9.I20100512.190
Subversive SVN Integration for the Mylin Project 2.2.2.I20100512.190
Re: The merge conflicts that aren't... [message #539251 is a reply to message #539018] Thu, 10 June 2010 07:52 Go to previous message
Igor Burilo is currently offline Igor Burilo
Messages: 435
Registered: July 2009
Senior Member
Hello David,

There's a problem with Subversive and we'll work on it, here's a link to
bug in tracker https://bugs.eclipse.org/bugs/show_bug.cgi?id=312585
Thanks for your notes.


> After several unsuccessful tries at updating to SVNKit 1.3.2, I was
> finally able to get it to work with Subversive 0.7.9. (Our project
> standard development environment had been updated to native SVN client
> 1.6.9, so effectively moving my Eclipse SVN client from 1.6.2 to 1.6.6
> seemed appropriate.)
>
> The problem is that since that update, normal merge seems to be
> completely messed up graphically. As I haven't been able to find any
> other mention of this fairly glaring symptom, I'm assuming there's
> something odd about my environment and I'm "unique"... but perhaps
> someone has some ideas.
>
> I work in a branch copied off of the project trunk. I make changes in
> the branch. Now, I merge the head of trunk onto my branch using
> Subversive (default "Start from Copy" range). I get the synchronize view
> showing all the files changed in both streams. Normally, I have only had
> to deal with a list of incoming changes, with perhaps one or two files
> marked as conflicts, with the red "double diamond" icon and
> "[conflicting change]" annotation on the file name.
>
> Now, every file that has changed on either side is marked as a conflict,
> every time I merge, even when there are no "*.merge*" files anywhere in
> the tree. When there are, so far as I can see searching for them myself
> from a shell window is the only easy way to find which files really do
> have conflicts. (I can try to commit, sort the state column, and look
> for "Conflict"... it knows the truth; but doing a shell 'find' is
> usually easier, especially if there are a lot of files in the merge.)
>
> When there are no real merge conflicts, I can just commit the merge with
> no problem. As I said, the commit dialog shows the correct file status.
> In other words, I don't think that Subversive really believes there are
> conflicts; it's just annotating the files in the synchronize view
> incorrectly.
>
> Any ideas?
>
> SVNKit 1.3.2 Implementation 2.2.2.I20100512.190
> Subversive SVN connectors 2.2.2.I20100512.190
> Subversive implementation 0.7.9.I20100512.190
> Subversive SVN Integration for the Mylin Project 2.2.2.I20100512.190


--
Best regards,
Igor Burilo
Previous Topic:help with importing into existing project
Next Topic:Including native targets in PDE build
Goto Forum:
  


Current Time: Sat Oct 25 07:07:33 GMT 2014

Powered by FUDForum. Page generated in 0.02619 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software