[Pkg-puppet-devel] Tags and upstream

[Micah Anderson]

Last night, when pushing the 2.7.11-1 tag, I accidentally pushed all
upstream's tags, some of which were refused. I went through and removed
them all, but I first had to disable the update hook because it was
denying me from doing interesting tags. I'm not even sure where that
hook came from, does anyone know? It seems to have been created in 2007,
based on the filesystem.

I also had some problems merging the upstream's release into master,
there were quite a few merge conflicts, which I would not expect as
going from pristine upstream X to pristine upstream Y should not result
in conflicts, so I'm a little puzzled about the state of that branch. In
the end I had to do 'git merge upstream/<newversion> -X theirs' to merge
in the new upstream. Perhaps its been done in a different way recently?

micah


-- 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-puppet-devel/attachments/20120224/afe2f2ca/attachment.pgp>