Re: Rebase of the pr-msvc-support branch?

[Eric Blake]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

According to Peter Rosin on 1/8/2009 12:43 PM:
> Should I kill the branch on savannah, rebase my local tree and finally
> push a brand new pr-msvc-support branch? Should I create a new topic
> branch named pr-msvc-support2? Should I merge git-head into the branch?
> That sure feels backwards, but what do I know? Please help.

Now that you've told us the branch will be rebased, it makes sense to just
keep the same branch name, rebase locally, then push that rebased branch
in place of the current one.  Rebasing topic branches is acceptable with
advance warning, and as long as we don't rebase the master branch.

> One final minor question, should we skip the patches to ChangeLog in
> the branch and recreate that part of the patches when/if the branch is
> merged? It seems that there is approximately 100% risk for the
> ChangeLog hunk to cause merge problems.

Check out Bruno Haible's git-merge-changelog, currently in the gnulib
repository.  It handles rebasing/merging of ChangeLog entries with minimal
hassle, reducing the risk of a ChangeLog merge interfering with your
rebase from 100% down to about 2%.

- --
Don't work too hard, make some time for fun as well!

Eric Blake             address@hidden
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAklmvVwACgkQ84KuGfSFAYBDnACeNFJnSH1GEGIwAWt0h1JfXfMJ
vY8AniR9sshdBEkqEvCupRchs18Kf38J
=jvW4
-----END PGP SIGNATURE-----