Re: [gentoo-dev] gentoo git workflow

[Ian Stakenvicius]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

On 15/09/14 09:13 AM, hasufell wrote:
> Rich Freeman:
>> On Mon, Sep 15, 2014 at 7:37 AM, hasufell <hasufell@g.o>
>> wrote:
>>> * repoman must be run from all related directories (or the
>>> top-level directory) on the latest commit that is being pushed
>>
>> This should be clarified.  Does repoman need to be run on the
>> exact commit that is being pushed, or perhaps on a "parent"
>> commit prior to rebasing/merging into the master branch?  (I use
>> parent liberally here, since that commit wouldn't be an actual
>> parent if it were rebased.)
>>
>
> Yes, you have to rerun repoman after a rebase or merge. On the tip
> of the local master branch (as in: right before you try to push).
>
> Sure, this may lead to problems if repoman takes long... but that's
> on purpose. If your changes are that big, then they should be
> communicated and coordinated properly without people randomly
> pushing changes in between that may break yours.
>
> That's no different from what we are doing right now, except that
> we have now enforced consistency instead of "maybe repoman is
> correct, maybe not".
>

Thread TL;DR -- apologies if this has already been brought up and
answered.

I'm not that worried about the big (multi-package) commits, as it does
make sense we're going to have difficulty and lots of potential
conflicts there, but aren't we going to run into this issue just with
multiple people committing separate single-package commits at the same
time??


-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2

iF4EAREIAAYFAlQW9wIACgkQ2ugaI38ACPBunQEAh5F1moJZnHhHEQDs8kiPuRBk
wwO2y9z6KEqKUPTzBAEA/A9Cv5Y444xC9tjmbUJ27qcRnziJgQnzu2K3YGKSCyL6
=Jc80
-----END PGP SIGNATURE-----