Re: [general] Is there any chance that we can use GIT to keep track of all commit information while merging

[Mark Hindess <ma...@googlemail.com>]

In message <94...@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:

  https://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....@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
> >
> 

Re: [general] Is there any chance that we can use GIT to keep track of all commit information while merging

[Sean Qiu <se...@gmail.com>]

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

Best Regards
Sean, Xiao Xia Qiu




2009/7/7 Mark Hindess <ma...@googlemail.com>:
>
> In message <94...@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:
>
>  https://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....@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
>> >
>>
>
>
>