Mailing-List: contact dev-help@harmony.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@harmony.apache.org
Received-SPF: pass (nike.apache.org: domain of sean.xx.qiu@gmail.com
 designates 209.85.222.186 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:from:date:message-id:subject:to
         :content-type:content-transfer-encoding;
        b=LWphfVPnTCQW3/XEQKfF2Ad+7asRVBS8f/Xn/FMibhXoDkt2meHcfRishoWXWKeGVk
         7Ls4EiFtl+5kk+xHbd8hz/IgwCEt8NYz5GFGnc+lsphb7vJgpv92ggWiS5Og+WA6UZeO
         L+eSRCPHB/9WU50TDKY5KRghI01cv6HrfVio0=
MIME-Version: 1.0
In-Reply-To: <20090707133540.E38B87248E4@athena.apache.org>
References: <94d710af0907062310h48429203sc41dd34b64424c7f@mail.gmail.com>
	<4A53472A.3030605@gmail.com>
 <94d710af0907070611q36bb538bl2b129ad78fe6fd42@mail.gmail.com>
	<20090707133540.E38B87248E4@athena.apache.org>
From: Sean Qiu <sean.xx.qiu@gmail.com>
Date: Wed, 8 Jul 2009 09:46:40 +0800
Message-ID: <94d710af0907071846r7c30fd6p351a17c869ff3e46@mail.gmail.com>
Subject: Re: [general] Is there any chance that we can use GIT to keep track
	of all commit information while merging
To: dev@harmony.apache.org
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

Cool. I can follow up if you need any help.

Best Regards
Sean, Xiao Xia Qiu


2009/7/7 Mark Hindess <mark.hindess@googlemail.com>:
>
> In message <94d710af0907070611q36bb538bl2b129ad78fe6fd42@mail.gmail.com>,
> Sean Qiu writes:
>>
>> Interesting, will investigate it with Mark.
>
> I was planning to try it with the latest merge but I ended up raising:
>
> =A0https://issues.apache.org/jira/browse/INFRA-2110
>
> instead. :-(
>
> I'll track the JIRA and keep trying a merge this way occasionally.
>
> -Mark.
>
>> 2009/7/7 Tim Ellison <t.p.ellison@gmail.com>:
>> > On 07/Jul/2009 07:10, Sean Qiu wrote:
>> >> I'm wondering whether we can take advantage of GIT to keep track of
>> >> all commit information while merging.
>> >> For now, we can only get a pile of codes each merging.
>> >>
>> >> If we can separate it into original records, that would be great
>> >> improvement to miantain our Java 6 branch.
>> >> 1. Create a remote branch of trunk5.
>> >> 2. Create a remote branch of Java6.
>> >> 3. Pull all commits from trunk5 to Java 6.
>> >>
>> >> Seems that it can't handle the conflicts as well as svn merge, had
>> >> anybody tried similar stuff?
>> >> Any commends or suggestions?
>> >
>> > You probably saw it, but Mark was discussing using the SVN metadata to
>> > better manage the merges [1].
>> >
>> > [1] http://markmail.org/thread/qntsbhnw3jtuapps
>> >
>> > Regards,
>> > Tim
>> >
>>
>
>
>