[PATCH] transplant: permit merge changesets via --parent
Steven Stallion
sstallion at gmail.com
Tue Apr 10 11:49:30 CDT 2012
On Tue, Apr 10, 2012 at 9:45 AM, Matt Mackall <mpm at selenic.com> wrote:
> On Sun, 2012-04-08 at 17:43 -0700, Steven Stallion wrote:
>> # HG changeset patch
>> # User Steven Stallion <sstallion at gmail.com>
>> # Date 1333932216 25200
>> # Node ID 3979508e3822d65024de83a7add1d2adbfa2f3bf
>> # Parent 329887a7074c8e49e73fa76712d8d45aee0d0fd7
>> transplant: permit merge changesets via --parent
>
> This fails a bunch of tests, dropping for now:
>
> Failed test-transplant.t: output changed
> Failed test-commit-multiple.t: output changed
> Failed test-keyword.t: output changed
> Failed test-largefiles.t: output changed
> # Ran 4 tests, 0 skipped, 4 failed.
Gotcha. I'll get this fixed up and resubmitted.
Steve
More information about the Mercurial-devel
mailing list