Re: git-dpm -> gbp conversion (mass-change)
Ruben Undheim <lists@beebeetle.com> writes:
> There is no nightmare unless there are patch conflicts.
The one case where you could have a "nightmare" is:
1. Maintainer A updates package to latest upstream version.
2. Maintainer A uploads packages to Debian, and it is accepted.
3. Maintainer A forgets to push changes to git. Or doesn't push all
branches/tags as required.
4. Maintainer B finds package, and updates to latest upstream version
(which could be later then what maintainer A saw).
5. Maintainer B pushes changes to git.
6. Somebody complains that fixes that where included in the first
version have now gone missing.
7. Maintainer A pushes his changes, find they are rejected, and wrongly
does a "push -f", loosing the changes from maintainer B.
OR
7. Maintainer A realizes what has happened, has two sets of patches
against two different upstream versions, and somehow needs to reconcile
them.
etc, etc.
However, I don't know of any workflow that would make the issues here
any easier.
Moral of the story, always make sure you pull changes (from all
branches) before starting to work, just to make sure nobody else has
made changes. Plus always make sure you push changes (all required
branches, e.g. "git push origin : --tags") after you finish work.
Easy to forget however.
--
Brian May <bam@debian.org>
Reply to: