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

[Harlan Lieberman-Berg]

Brian May <bam at debian.org> writes:
> 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.

Yeah, it's probably because of the rebase.  There was definitely a merge
commit from upstream/2.3 when I was ready to commit things.  I did the
rebase afterwards, so it probably got wiped out.  SOrry about that.

> 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.

Makes sense.  Sorry about that!

-- 
Harlan Lieberman-Berg
~hlieberman