[request-tracker-maintainers] git repo at risk; upstream branch breakage

[Niko Tyni]

On Tue, Mar 26, 2013 at 08:35:32AM +0200, Niko Tyni wrote:
> On Tue, Mar 26, 2013 at 12:50:33AM +0000, Dominic Hargreaves wrote:
>  
> > I just noticed that the upstream branch (and thus master
> > which is merged from upstream) has ended up not being descended
> > from the old upstream with the commit history back to 4.0.1.
> > This appears to have been caused by git-dpm import-new-upstream,
> > of 4.0.10 (the first use of git-dpm in this repo), even though it is
> > not expected to do this.
> > 
> > I don't know why this has happened; clues welcomed if anyone knows
> > what's going on here, otherwise please take this as a warning that
> > I may have to do a forced push to repair things, meaning that anything
> > based on the current master (post-4.0.10 import) will need to be 
> > rebased.
> 
> Sounds weird. I'll try to have a look when anonscm.debian.org is reachable
> again (it's refusing connections atm). No problem with the forced push
> on my part FWIW.

Oh, it's reachable via ssh so I've got the clone now.

Sorry, I can't make sense of it. I tried to redo an 'import-new-upstream'
operation on top of 7ac49511bdf8a06718c579a0a72bd4a11456b390 but that
seemed to work as expected.

The -third-party stuff confuses me, and perhaps git-dpm too. I note
there's a 'component:' entry in debian/.git-dpm so I suppose you've
used the '--component' git-dpm option at some point?

Anyway, feel free to force push whatever fix you come up with :)

Cheers,
-- 
Niko