http://bugs.grommit.com/show_bug.cgi?id=462
------- Comment #6 from mike.kupfer at sun.com 2008-04-26 17:35 PDT ------- (reply to comment #4) The merge code can indeed be used any time the Teamware and Mercurial parents are mismatched. I'm just not expecting that to happen much until after the ON gate moves. And I figured that we'd have a workaround for those few cases (point HGMERGE at meld). I confess I'm not as comfortable about that plan as I was. When I originally wrote wx2hg, I wasn't really comfortable with doing time travel using "hg update". So wx2hg tries to help with the 3-way merge. Perhaps it would be better to just do "hg update" to the specified revision, then apply the changes as though the parents were in sync. wx2hg could either tell the user to do a commit/merge, or it could do that for the user (I'm not sure which is better). This would have the benefit of using Mercurial's normal merge mechanism and user interface. We just want to make sure that the working directory eventually ends up back at tip, to avoid confusing the user later. -- Configure bugmail: http://bugs.grommit.com/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug, or are watching the assignee.
