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 t.p.ellison@gmail.com
 designates 209.85.219.206 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:user-agent:mime-version:to:subject:references
         :in-reply-to:x-enigmail-version:content-type
         :content-transfer-encoding;
        b=DhqnoJHdy+8U1aJtk12Td40jD+36WfRUJd1JGvgQih7Cjd/IZTako9kAev0qPFEz4m
         MzyPUi/dJgw5pkz1WEyfr8Z2GANiKGNSgc8ZTBfnT2x9TbpvAJOHg+M4Uv7y9a146mfi
         /QXMBvDsr+5G/K4OeLqqNjWOx5hb95CD+Whh0=
Message-ID: <4A53472A.3030605@gmail.com>
Date: Tue, 07 Jul 2009 14:01:30 +0100
From: Tim Ellison <t.p.ellison@gmail.com>
User-Agent: Thunderbird 2.0.0.22 (Windows/20090605)
MIME-Version: 1.0
To: dev@harmony.apache.org
Subject: Re: [general] Is there any chance that we can use GIT to keep track
 of 	all commit information while merging
References: <94d710af0907062310h48429203sc41dd34b64424c7f@mail.gmail.com>
In-Reply-To: <94d710af0907062310h48429203sc41dd34b64424c7f@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

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