On Wed, 2010-09-01 at 09:59 -0400, Tom Lane wrote:
Matt McCutchen <matt(a)mattmccutchen.net> writes:
> I personally don't like fedpkg doing magic based on the name of the VCS
> branch I am on and would use a "branch" file. I don't see what the
> deal is about having the branches identical; I think seeing the
> difference in the "dist" value could actually be a helpful reminder.
Actually, the branches *can't* be identical, in practically every
nontrivial case, because (if nothing else) the %changelog will diverge.
If you're copying log entries into a branch where those changes did not
actually happen, you are not doing the right thing.
From the view of git, the %changelog is just another bunch of data --
and doing that is called a "rebase", I believe.
As Matt said, this sort of difference shouldn't hurt the ability
merge or cherrypick diffs from one branch to another.
I stand corrected.
Nils Philippsen "Those who would give up Essential Liberty to purchase
Red Hat a little Temporary Safety, deserve neither Liberty
nils(a)redhat.com nor Safety." -- Benjamin Franklin, 1759
PGP fingerprint: C4A8 9474 5C4C ADE3 2B8F 656D 47D8 9B65 6951 3011