resolve conflicts with multiple persons

[Ike Casteleyn]

Hi Simon,
I will go with your recommendation of doing the merge again on each devbox.Thanks for this.
Best regards,Ike

> From: simon at simonking.org.uk
> Date: Tue, 7 Jul 2015 14:25:09 +0100
> Subject: Re: resolve conflicts with multiple persons
> To: icasteleyn at hotmail.com
> CC: mercurial at selenic.com
> 
> On Tue, Jul 7, 2015 at 1:24 PM, Ike Casteleyn <icasteleyn at hotmail.com> wrote:
> > Hi,
> >
> > We are undertaking a major merge between 2 branches (read: a few years
> > apart).
> > To make this 'easier' we want to resolve the conflicts with multiple persons
> > (instead of one poor soul doing all the work).
> >
> > First possibility:
> > Commit the merge with all unresolved conflicts and then each developer can
> > resolve conflicts on his machine.
> > We communicate who resolves which files.
> > Commiting unresolved conflicts isn't allowed, so this possibility isn't
> > possible.
> >
> 
> While it isn't possible to commit unresolved conflicts, it is possible
> to mark all the files as resolved ("hg resolve -m"), and commit the
> result. The developers could then fix up the files they are
> responsible for in separate commits. You'd want to keep track of the
> files that were originally marked unresolved, and you'd need to
> execute your merge tools by hand because mercurial won't launch them
> for you. I wouldn't do it this way though, see below.
> 
> > Second possibility:
> > I created a clone on a shared folder and did the merge there.
> > We don't need to commit, but each developer can resolve conflicts in the
> > shared location (again communicating who resolves which files).
> > Problem here is that the working copy gets locked when you open a file in
> > mergetool and all other devs need to wait now.
> > Perhaps I could delete the wlock file to get passed this, but that seems
> > 'dangerous'.
> >
> > Is it possible to do this in a safe way?
> > Or if not possible in a safe way, in an unsafe way (and what would the risks
> > be then)?
> >
> 
> Each developer could run the same "hg merge" command on their local
> machine, fix the files that they are responsible for, and send them to
> a person acting as integrator. The integrator runs the same merge
> command then adds the files received from each developer, using "hg
> resolve -m" to mark them as resolved. As long as everyone is merging
> the same 2 revisions, there shouldn't be any risks in this approach.
> 
> Hope that helps,
> 
> Simon
 		 	   		  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20150707/5c4af3f8/attachment-0002.html>