Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-scm
Navigation:
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-scm@g.o
From: "Robin H. Johnson" <robbat2@g.o>
Subject: Re: gentoo-x86 on git - Manifests
Date: Thu, 19 Feb 2009 13:45:08 -0800
On Thu, Feb 19, 2009 at 11:54:55AM -0800, Donnie Berkholz wrote:
> > A distfile-only Manifest should merge extremely well, as it will seldom
> > have conflicts.
> I'd considered only the distfiles in manifests. There will still be a 
> conflict every time there is a newer version in one branch (say an 
> overlay, where the files are copied directly across and one bump is 
> made) and older versions are deleted in the other branch (during a 
> typical tree cleanup), right?
Simultaneous add and delete being merged in the same spot of the file is
the only time I can create a conflict. This case already happens with
CVS, we just 'solve' it by doing regen instead of fixing by hand.

Branches A,B

Cases:
1. DIST line already exists on A, not on B
   Merge A->B - no conflict
2. Identical DIST line exists in both A and B but was added separately.
   Merge A->B - Git sees that the exact changeset already exists and no
   conflict :-).
3. A has a line added. B has a line removed right in the same spot as
   the added line.
   Merge A->B - Git triggers a conflict.

-- 
Robin Hugh Johnson
Gentoo Linux Developer & Infra Guy
E-Mail     : robbat2@g.o
GnuPG FP   : 11AC BA4F 4778 E3F6 E4ED  F38E B27B 944E 3488 4E85
Attachment:
pgp6VllZSf1dg.pgp (PGP signature)
References:
gentoo-x86 on git - Manifests
-- Maciej Mrozowski
Re: gentoo-x86 on git - Manifests
-- Donnie Berkholz
Re: gentoo-x86 on git - Manifests
-- Robin H. Johnson
Re: gentoo-x86 on git - Manifests
-- Donnie Berkholz
Navigation:
Lists: gentoo-scm: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: gentoo-x86 on git - Manifests
Next by thread:
Re: gentoo-x86 on git - Manifests
Previous by date:
Re: gentoo-x86 on git - Manifests
Next by date:
Review tool


Updated Jun 17, 2009

Summary: Archive of the gentoo-scm mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.