[haiku-development] Re: Git/Hg: some speed tests

  • From: Ryan Leavengood <leavengood@xxxxxxxxx>
  • To: haiku-development@xxxxxxxxxxxxx
  • Date: Wed, 4 May 2011 19:33:04 -0400

On Wed, May 4, 2011 at 7:28 PM, Oliver Tappe <zooey@xxxxxxxxxxxxxxx> wrote:
>
> On 2011-05-05 at 00:48:51 [+0200], Ingo Weinhold <ingo_weinhold@xxxxxx>
> wrote:
>> When committing 2a before 2b those are swapped in the end result. Though I
>> find this result more interesting with respect to revision number tags. I
>> assume the result would be:
>>
>> central:  1 - 2b - 2a - merge
>> tags:    r1 - r3 - r2 - r4
>>
>> Right?
>
> Yes, I think so. But, AFAICS, it's just like Niels has said: there really is
> no order between 2a and 2b, they are just sitting next to one another.

Yeah. Bad ASCII art:

     2a
1  /   \  merge
   \    /
    2b

Unless you rebase :)

-- 
Regards,
Ryan

Other related posts: