Gentoo Archives: gentoo-scm

From: "Robin H. Johnson" <robbat2@g.o>
To: gentoo-scm@l.g.o
Subject: Re: [gentoo-scm] gentoo-x86 on git - Manifests
Date: Thu, 19 Feb 2009 22:12:16
In Reply to: Re: [gentoo-scm] gentoo-x86 on git - Manifests by Donnie Berkholz
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