On Mon, 21 Jul 2008, Alan DuBoff wrote:
> Date: Mon, 21 Jul 2008 14:51:07 -0700 (PDT) > From: Alan DuBoff <Alan.Duboff at Sun.COM> > To: tools-compilers at opensolaris.org > Subject: Re: [tools-compilers] How do I merge a conflict in Mercurial? > > On Mon, 21 Jul 2008, Mark J. Nelson wrote: > >> You generally want to make sure that your .hgrc file is setup to point to a >> valid, graphical filemerge tool. Then just run "hg merge." > > Yeah, that's what I thought and added this: > > [merge-tools] > meld.gui=True > meld.priority=0 That looks correct. I have the following: [merge-tools] filemerge.gui=True filemerge.args=-a $base $local $other $output filemerge.priority=1 meld.gui=True meld.priority=0 ...which should use filemerge if it's available, and fall back to meld otherwise. > I do have meld in the path and can execute it, but it doesn't seem to give > me the merge tool for some reason. It will only pop up a merge tool if it can't figure out what to do. So you might actually not need to tell it anything, if there were no ambiguous/overlapping edits to the same files. >> Mercurial will automatically include files from both parent changesets, >> and even automatically merge file changed in both. When it can't do >> that (because changes overlap), it will start a graphical file merge >> tool for each such conflicting file. > > Yeah, that would be nice and what I had expected with the above. > >> If you insist on a more manual approach, you can do "hg status -mard --rev >> 6362:6972," but I don't think that will really make you happy. > > I guess if the merge tool would work, I'm ok with that. > > Would it be looking for something different than meld in the path? No, it shouldn't be. After the "hg merge" command exits, what does "hg status -mard" tell you? Does it make sense? Did the output of "hg merge" remind you to commit your changes? Because that would indicate that it completed successfully, otherwise it would be telling you to try again be doing an "hg update -C old_rev ; hg merge new_rev" sequence. --Mark
