[Python-modules-team] Bug#856625: Accidentally duplicated work

[Brian May]

Harlan Lieberman-Berg <hlieberman at debian.org> writes:

> I was following #856625 and accidentally duplicated some work of yours.
> I saw that the RC bug was fixed in the latest upstream release, so I
> packaged 2.3 and shoved it into the git before I saw you had started
> working on cherry-picking the patch in.  I've rebased my work and pushed
> it up as UNRELEASED, just in case it is helpful for the future.

I am not sure how you updated to the latest upstream version. Somehow
you did it without merging from upstream. As this is still a git-dpm
package, you should be using git-dpm tools to update to a new
upstream. Maybe this is as a result of a rebase - a rebase won't
preserve merge commits. If you type in "git-dpm status" you can clearly
see it is not happy.

However, more importantly, the release team is very unlikely to let a
new upstream version into unstable.

So, unfortunately, I am inclined to remmend reverting all changes on the
master branch since debian/2.1-3 for now. If you want, I can do
this. Because if any future RC bugs occur during the freeze, we need to
be able to make new releases from from the master branch for the same
upstream version.
-- 
Brian May <bam at debian.org>