Intland's free requirements, development and test management hosting.
This server hosts 100.000+ users on the cloud!
Transplant can not be completed when the merging fails with some problems#11678/v4
more
Tags:  not added yet

Transplant can not be completed when the merging fails with some problems[BUG-11678]

Tracker: Bugs Priority: NormalNormal Status: Closed
Submitted by: zluspai Apr 13, 2010 11:56 Modified by: johnpeb Nov 18, 2010 17:13 Assigned to: ilya_ivanov, johnpeb Oct 08, 2010 00:04
Category: -- Severity: -- Resolution: Implemented
Release: -- Detected: --
Relations (2)
icon Transplant conflict usability change request is related to this bug association
icon Transplant Wizard UI design issues change request is related to this bug association
Description
The version is: "MercurialEclipse 1.6.0.201004042010".

I have tried to transplant one changeset and it has failed with some merging problems (.rej files are created), so I had to use manual merging. This is fine so far, I did the merge manually. But the problem is that I can not commit the transplanted changes back, because if I do the commit Mercurial won't know about that I have transplanted the changes.

In previous HgEclipse/MercurialEclipse the transplant process worked better, because when the transpant was failing then the project stayed in a "MERGING" state, and after the manual merge I could say "continue transplant" on the transplant wizard (or I could do a "transplant --continue" on command line). This seems not possible now?

Details
Comments & Attachments (0)
Associations (2)
Children (0)
References (0)
SCM Commits (0)
All (0)

In Office
Filter
Submitted Comment
Nothing found to display.