[PATCH] merge: let the user choose to merge, keep local or keep remote subrepo revisions

[Augie Fackler]

On Sep 25, 2013, at 2:20 AM, Angel Ezquerra <angel.ezquerra at gmail.com> wrote:

> On Wed, Sep 25, 2013 at 6:00 AM, Kevin Bullock
> <kbullock+mercurial at ringworld.org> wrote:
>> On 7 Sep 2013, at 12:09 AM, Angel Ezquerra wrote:
>> 
>>> # HG changeset patch
>>> # User Angel Ezquerra <angel.ezquerra at gmail.com>
>>> # Date 1378420708 -7200
>>> #      Fri Sep 06 00:38:28 2013 +0200
>>> # Node ID 15548e5b1c00bd2f261e3c81d39f2465263bc3c3
>>> # Parent  1d07bf106c2ad1c7ef5e257e754ca8d858bd04b0
>>> merge: let the user choose to merge, keep local or keep remote subrepo revisions
>> 
>> Fails tests:
> 
> Sorry about that. I did not have git nor svn installed on my machine.
> I installed them, re ran the tests and fixed them. I'll send an
> updated patch in a minute.
> 
> BTW, in the last "note" on the commit message I said:
> 
> "I don't know of a way to test the "keep local" and "keep remote" options (i.e.
> to force the test to choose those options)."
> 
> Is that a problem? I tested it manually and it does work fine, but I'd
> rather have an automated test. The problem is that I don't know of a
> way to tell run-tests to answer "l" or "r" to the prompt that asks
> which subrepo revision to use?

HGMERGE=internal:local
or
HGMERGE=internal:other

might help?

> 
> Cheers,
> 
> Angel
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel