Gentoo Archives: gentoo-scm

From: "Tomáš Chvátal" <scarabeus@g.o>
To: gentoo-scm@l.g.o
Subject: Re: [gentoo-scm] gentoo-x86 on git - Manifests
Date: Wed, 18 Feb 2009 23:01:39
Message-Id: 200902190000.09900.scarabeus@gentoo.org
In Reply to: [gentoo-scm] gentoo-x86 on git - Manifests by Maciej Mrozowski
1 My ideas:
2 The important part is that the manifests block reasonable branching/merging
3 cause it will allways cause collisions (yeah i know i can cherry pick). So
4 possibility would be to remove the manifest from the first commit and commit
5 them right afterwards. So the messages would look like:
6 * Fix gcc-4.3-issue for libfoo. Per bug #22222.
7 * Manifest for libfoo.
8 And for picking you would just pick the first ones and ignore manifest ones.
9 The sidefect of this will be the spam on git log, where every second commit
10 will be manifest. Any ideas/alternatives to this?
11 (this behavior really enables the picking as we want, alternative what i am
12 right now able to think of is creating separate branch/server containing only
13 manifests which would get merged for rsync... [which is of course insane
14 overhead so dont even think about it :P])
15
16 Regards
17 Tomas Chvatal

Attachments

File name MIME type
signature.asc application/pgp-signature