Collaborative ALM
Free SaaS for open source projects on Amazon EC2
Login | About  
 
   
   
[BUG-12154]  -  Pull with Merge option fails if merge conflicts exist
Tags:   No tags associated yet.
All Tags...
Go Back
  0  
 Tracker:  Bug  Priority:  High  Status:  Closed
 Submitted by:  KlausMehling Jun 24 03:37  Modified by:  ilya_ivanov Aug 13 10:33  Assigned to:  ilya_ivanov Jul 30 09:31
 Category:  Merge  Severity:  Blocker  Resolution:  Worksforme
 Target:  --  Detected:  --
Description:
If I submit a pull with merge and conflicts erase during merge, the conflicting files are shown for a few seconds in the "Mercurial Merge" view, but then they dissapear and the merge aborts, but without any further notice and without refreshing the status. Doing a manual status refresh, then shows that "MERGING" is in progress and that conflicts exist, but there is no way to resolve the conflicts via the HgEclipse plugin (the "Mercurial Merge" view stays empty).
Details:
Comments (8)
Attachments (0)
Children (0)
Associations (1)
SCM Commits (0)
All (8)

Submitted Comment
zkoppany
Aug 12 11:17
I mean Merge Editor appends code fragments.
zkoppany
Aug 12 11:16
Don't reproduce the problem with older versions because it is also possible that hg caused the problem. Right now all of us do work with hg-1.6.2. Instead of please fix the merge editor problem you reported today.
ilya_ivanov
Aug 12 11:05
Couldn't yet reproduce the errors you descrubed. Tomorrow I will try to use an old build with old hg version. If that helps reproducing problem it will mean that bug was fixed.

Also if you can recall something valuable that you did when merging problems or working copy corruption occured, it could be really helpful.
zkoppany
Aug 12 07:21
First please summarise the current state of conflicts.

I had huge problems if I tried to push change-sets where the same files (also line locations) had been changed by others.
zkoppany
Aug 11 12:42
Ilya, please make merging more robust. I don't know whether this is still a problem but earlier plugin version sometime destroyed my working copy thus I had to clone the repository again.
KlausMehling
Jul 30 06:47
Upgrading to HG 1.4.3 did not solve the problem.
KlausMehling
Jun 24 05:26
This seemed to be caused by a local Mercurial 1.3.1 installation (under /usr/local/bin). Seems that MercurialEclipse 1.6.0 has problems with Mercurial 1.3. Let's see if this problem has gone with Mercurial 1.4.3-1.
zluspai
Jun 24 05:06
This might be caused by that an old Mercurial 1.3.1 was installed on Klaus's pc.

Even in this case if the plugin needs Mercurial 1.4.1 then it should check the Mercurial version number and complain about if that's insufficient.