[Pkg-puppet-devel] [SCM] Packaging of Facter for debian branch, master-gbp, created. 8adbac73ddbe633b82f50c61b838ad6a7c96af12

[Nigel Kersten]

On Fri, Jan 29, 2010 at 12:03 PM, Nigel Kersten <nigelk at google.com> wrote:
> The branch, master-gbp has been created
>        at  8adbac73ddbe633b82f50c61b838ad6a7c96af12 (commit)
>
> - Shortlog ------------------------------------------------------------
> commit 8adbac73ddbe633b82f50c61b838ad6a7c96af12
> Author: Nigel Kersten <nigelk at google.com>
> Date:   Fri Jan 29 11:58:14 2010 -0800
>
>    pull in debian directory, rebuilt around using install.rb instead
>
> -----------------------------------------------------------------------
>

It's unfortunate that I seem to have to do this, but let me talk
through what I did.

I was unable to get upstream/1.5.7 to cleanly merge on top of our
existing master.
I fiddled around for a while doing it by hand, and fixed up the merge.

As a test, I then tried merging some post 1.5.7 upstream changes into
the same branch, and had to manually resolve all the conflicts again.
This isn't a workable long term solution.

So I took the debian/* stuff I did to move to install.rb and be ruby
1.8 only again and backed it up and did something like:

$ git checkout -b 1.5.7 upstream/1.5.7
$ (restore debian dir from backup)
$ git add debian/*
$ git commit blah blah
$ git push origin 1.5.7:refs/heads/master-gbp

I didn't want to wipe out the existing master without some consensus
here, so at the moment you should be able to build facter 1.5.7 by:

$ git clone ssh://${YOURGITUID}@git.debian.org/git/pkg-puppet/facter.git
$ cd facter
$ git checkout -b master-gbp origin/master-gbp
$ git-buildpackage \
  --git-debian-branch=master-gbp \
  --git-upstream-branch=origin/upstream \
  --git-upstream-tag=upstream/1.5.7

Once I get some consensus, I'd like to rename the existing "master" to
something else indicating the historical nature, and rename
"master-gbp" to "master".

Does that seem sane?