non-graphical merge tool

[Justinas Urbanavicius]

on windows and linux there is a tool called meld, great and very intuitive
for merges, you could try that. Netbeans IDE has something similar built in.

if the other programmer runs hg merge the conflicting changes will be left
and only visible on his computer, he cannot share them, or like you said
send them to you.
The only way you could avoid him doing the merges is to do a hg push -f,
that way he will push his head into the repository ant you could merge for
him, after pulll.
If you only want him to not do conflicting merges, then he should, commit
his changes, pull, do the merge, if there is a conflict do hg update -C
(revert back to his working copy) and then push -f (push out his head so
you can resolve).

my suggestion would be to try a few merges with him, otherwise how else is
he going to learn if you don't let him do anything, and besides, you can
always revert or backout of a specific commit/merge, if he has done
something wrong, it is version control after all :)


On Thu, May 15, 2014 at 5:39 AM, Michael Mossey <michaelmossey at gmail.com>wrote:

>
>
>
> On Wed, May 14, 2014 at 7:07 PM, Dave S <snidely.too at gmail.com> wrote:
>
>> On Wed, May 14, 2014 at 6:36 PM, Michael Mossey <michaelmossey at gmail.com>wrote:
>>
>>> I'm working on Windows in a two-developer project, and the other guy is
>>> not an experienced programmer. If he runs "hg merge" I don't want it to pop
>>> him into kdiff3 as he probably won't understand it. I would rather that
>>> Mercurial leave conflicting merges in the file with merge marks so he can
>>> send it off to me to fix. How would I set Mercurial to do a non-graphical
>>> merge in the presence of conflicts, i.e. leave merge marks?
>>>
>>>
>> Maybe use the "internal:fail" merge-tool, and then hg resolve -l ?
>> (easily done with a .bat or .sh file)
>>
>> Another option would be to use hg merge --preview, but then you'd be
>> involved even for the no-conflict merges.
>>
>> /dps
>>
>>
>>
>
> The "Definitive Guide" suggests setting HGMERGE, and in his book examples
> he sets it to the Unix tool "merge" to produce the merge marks. This tool
> isn't on Windows, however. (kdiff3 is--it comes with WinPython). How do I
> tell it to use "internal:fail"?  Is this an hgrc setting? Will merges
> complete normally when changes aren't conflicting?
>
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>


-- 
Justinas
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140515/056864b9/attachment-0002.html>