Guido Günther <a...@sigxcpu.org> writes:
> On Tue, Mar 20, 2012 at 01:28:34PM -0700, Russ Allbery wrote:
>> No, I think that's the only real change. It should be fairly simple
>> for someone who knows the right place to add the change.
> I've pushed a version that should do the above. I'd be happy to hear if
> this looks as expected.
I tested this with openafs 1.6.1-1 and it worked *great*. You can see the
results at:
http://git.debian.org/?p=pkg-k5-afs/openafs.git
if you're curious. It worked exactly the same as our old tool did, so I'm
going to toss our tool in favor of using git-buildpackage directly. Thank
you so much!
> What I'm missing from the above workflow is how you actually get
> started. By creating an empty upstream branch and importing the tarball
> on top of it?
That's a very good question! I never figured that out because I've always
switched existing packaging over to this system rather than starting from
scratch.
I think there are two options:
1. Import the tarball into a new branch, which creates a detached branch
(no relationship with anything else in the repository), and then commit
a merge with the upstream VCS tag with no changed files (basically
equivalent to doing a git merge -s ours with the VCS tag). This starts
the branch with two commits and shows the tarballs as an independent
line of development from the upstream line.
2. Commit the tarball import as a regular commit whose parent is the
upstream VCS tag provided, and then make the upstream head point to
that commit. Or, in other words, exactly like what you do when there's
an existing upstream branch except leave out the upstream branch as a
parent, which makes the commit only have one parent and no longer be a
merge. This will show the upstream branch as starting a line of
development branched off of the upstream release tag instead.
I'm not sure which of those is best. I can argue either one makes more
sense semantically depending on how I squint at it. I think it's a
toss-up, really; they'll both result in the same files, and pretty close
to the same history.
--
Russ Allbery (r...@debian.org) <http://www.eyrie.org/~eagle/>
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
