hc-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michael Osipov <micha...@apache.org>
Subject Re: Do not commit to HttpCore SVN!
Date Wed, 10 May 2017 21:25:36 GMT
Am 2017-05-10 um 23:19 schrieb Oleg Kalnichevski:
> On Wed, 2017-05-10 at 22:00 +0200, Michael Osipov wrote:
>> Am 2017-05-10 um 21:54 schrieb Oleg Kalnichevski:
>>> On Wed, 2017-05-10 at 21:45 +0200, Michael Osipov wrote:
>>>>
>>>> This will a problem anyway because all paths change (package
>>>> names,
>>>> etc.). Hopefully Git's similarity algorithm can detect this.
>>>>
>>>
>>> No, it is not. Git is that great. It always amazes me how
>>> intelligent
>>> Git when it comes to merging stuff.
>>
>> That's awesome, I had to do this once on a project and provided a
>> similarity key and voila -- it worked. Git tracks content, not files
>> like Subversion.
>>
>> But your answer is contrary to your previous statement -- cherry-
>> picking
>> shouldn't be a fuzz with two different repos. Can you explain why?
>>
>
> My understanding is that cherry picking is not possible if remote
> branches do not share the same commit history. If they do, they might
> as well be branches in the same repository.

Seems to be true. How about a patch from cherry-pick and a git apply?


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@hc.apache.org
For additional commands, e-mail: dev-help@hc.apache.org


Mime
View raw message