Re: cg-log patches

From: Petr Baudis <pasky@ucw.cz>
Date: May 10, 2005, 00:37 UTC
Message-ID: <20050510003713.GL15712@pasky.ji.cz>
In-Reply-To: <20050509121435.GB18382@pasky.ji.cz>

Dear diary, on Mon, May 09, 2005 at 02:14:35PM CEST, I got a letter where Petr Baudis <pasky@ucw.cz> told me that...

Show 24 quoted lines

> In git, the parents list is unordered. But this is different in Cogito,
> where the first parent _is_ special. If you are merging _from_ branch B
> _to_ branch A, the order of parents will be always
> 
> parent A
> parent B
> 
> In practice, it does not make too much difference, but this is one of
> the cases where it makes difference. So I think the current behaviour is
> right.
> 
> BTW, this also implies that merges
> 
>   A --
>       \
>   B ---+--
> 
> and
> 
>   A ---+--
>       /
>   B --
> 
> are considered as different ones by Cogito

Ok. So you do

A ---+--
    /
B --

and now merge A to B, which results in fast-forward and

A ---+----
    /  \
B --    --

but when doing cg-log in B, the merge is the wrong way around now.

Sean counterexample works too, it's a good thing to maintain compatibility with git at this one too.

Still, I would like to have the files list separated. What about one bullet per parent? Like

    * asdf, hjkl, xyzzy
    * hjkl, quux

for a regular two-parents merge.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor