[pulseaudio-discuss] Fixing git branches

Tanu Kaskinen tanuk at iki.fi
Thu May 6 22:37:36 PDT 2010


The rules documented in http://pulseaudio.org/wiki/GitBranches seem
sensible to me, but the documentation doesn't match reality: according
to the wiki page, there should be a branch named "0.9.21-stable", but
there isn't, and all commits in stable-queue should also be in master,
but they aren't.

Which one is wrong, the documentation or the implementation? If the
latter, are the following steps the things that need to be done in order
to fix the situation?

 * Merge stable-queue into master.
 * Create 0.9.21-stable, initializing it to point to the "v0.9.21" tag.
 * Go through all commits in stable-queue since v0.9.21 and move pure
bug fixes into 0.9.21-stable, leaving "minor new additions" in
stable-queue (this would mean rewriting stable-queue's history).

If I've understood everything correctly so far, is there anything else
holding that work from being done than the fact that nobody has had the
motivation to do it? If there are no other problems, I think I'd be
willing to do at least the first step next week. If the two other steps
are considered important, I could do them too, but maybe the
stable-queue-only solution for 0.9.21 updates is good enough for this
release cycle.

If I should go ahead and do the merge, does someone have hints what to
do with the numerous .po file conflicts like this:

<<<<<<< HEAD
#: ../src/modules/module-rygel-media-server.c:593
#: ../src/modules/module-rygel-media-server.c:607
#: ../src/modules/module-rygel-media-server.c:570
#: ../src/modules/module-rygel-media-server.c:584
>>>>>>> origin/stable-queue

I'm not familiar with .po files - can I possibly ignore the conflicts
altogether and regenerate the files easily after the merge to reflect
the updated state of the master branch? If so, how is that done?

Tanu Kaskinen

More information about the pulseaudio-discuss mailing list