Bug#856625: Accidentally duplicated work

2017-03-10 Thread Brian May
Harlan Lieberman-Berg writes: > 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. To be fair, I probably would have tried the same

Bug#856625: Accidentally duplicated work

2017-03-10 Thread Harlan Lieberman-Berg
Brian May 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

Bug#856625: Accidentally duplicated work

2017-03-10 Thread Brian May
Brian May writes: > However, more importantly, the release team is very unlikely to let a > new upstream version into unstable. err... Obviously I meant testing. :-( -- Brian May

Bug#856625: Accidentally duplicated work

2017-03-10 Thread Brian May
Harlan Lieberman-Berg 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 reb

Bug#856625: Accidentally duplicated work

2017-03-10 Thread Harlan Lieberman-Berg
Hi Brian, 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