Re: kvm repository unification

Avi Kivity
2007-03-20T14:43:30Z

Arnd Bergmann wrote:
> On Tuesday 20 March 2007, Avi Kivity wrote:
>
>> How does that work with multiple developers?
>>
>
> You need a set of well-understood rules if more than one person
> has commit access to the repository.
>
> The most simple rule would be that everyone just adds patches at
> the end of the quilt series. When you submit something upstream,
> you can then still decide to fold multiple patches.
>

That essentially mimics the subversion workflow, where a commit is
equivalent to appending a patch.

> As an extension, it is possible to allow changing a previous patch
> by replacing it with a forked one. E.g. kvm-add-foo.patch can
> get replaced by kvm-add-foo-2.patch, when that contains an improved
> version.
>

Ewww, diffs of patches! Better to have separate 'add cleanup patch' and
'fold-with-no-change' steps.

> I've never tried the cherry pick approach, since my team for historic
> reasons still uses CVS, which doesn't have changesets. If it works well
> for you, I guess you shouldn't change.
>

I'm mostly comfortable by now with git, but there are others here who
are sweating blood over it, so I'm interested in alternatives.

--
error compiling committee.c: too many arguments to function