Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.debian.kernel > #56138

Bug#847681: packaging repository and sid diverging? Various fixes needed.

Cross-posted to 2 groups.

Show all headers | View raw

On Tue, Dec 13, 2016 at 08:55:34PM +0100, Daniel Pocock wrote:
> Hi Ben,
> 
> Thanks for providing this feedback
> 
> I've done the following:
> - forked the upstream repository
> - created a debian/sid branch
> - copied debian/* from jessie into that branch and committed
> - copied debian/* from sid into that branch and committed
[...]

Haven't checked the actual repo, but this sounds horrible to me.

Even just using dgit would likely give you a better history.

I'd instead suggest you do something like this to preserve some
most history:

- clone the existing kernel-team repo
- git reset --hard the master branch to the last tag/commit/whatever
  where the repo and the uploaded packages are in sync.
- do the above for other branches as well if needed.
- import NMUs and other uncommitted uploads.
- git cherry-pick the remaining commits from origin/master, etc.

This would create a repo that's not a fast-forward of the current one
but still preserves as much history etc as possible.

Possibly even better would be to create a fast-forward compatible
repo with a "complex" history. Eg. like this:

- clone the existing kernel-team repo
- checkout a debian-archive branch from the last tag/commit/whatever
  that was in sync with the archive.
- checkout a upstream-archive branch from tha last tag/commit/whatever
  from upstream that was in sync with the archive.
- import uncommitted archive uploads in debian-archive (and upstream-archive
  if needed).
- gbp buildpackage --git-debian-branch=debian-archive --git-upstream-branch=upstream-archive --git-tag-only
- merge debian-archive into master and upstream-archive into upstream
- (remove debian-archive and upstream-archive branches, you have tags
   if you ever need a handle to these again.)

HTH.

Regards,
Andreas Henriksson

Back to linux.debian.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-10 16:40 +0100
  Bug#847681: packaging repository and sid diverging? Various fixes needed. Andreas Henriksson <andreas@fatal.se> - 2016-12-10 17:00 +0100
    Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-12 08:00 +0100
      Bug#847681: packaging repository and sid diverging? Various fixes needed. wferi@niif.hu (Ferenc Wágner) - 2016-12-12 10:30 +0100
        Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-12 10:40 +0100
          Bug#847681: packaging repository and sid diverging? Various fixes needed. wferi@niif.hu (Ferenc Wágner) - 2016-12-12 11:40 +0100
        Bug#847681: packaging repository and sid diverging? Various fixes needed. Salvatore Bonaccorso <carnil@debian.org> - 2016-12-12 11:20 +0100
          Bug#847681: packaging repository and sid diverging? Various fixes needed. Ben Hutchings <ben@decadent.org.uk> - 2016-12-12 21:10 +0100
            Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-13 21:10 +0100
              Bug#847681: packaging repository and sid diverging? Various fixes needed. Raphaël Halimi <raphael.halimi@gmail.com> - 2016-12-13 21:30 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-13 21:40 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Raphaël Halimi <raphael.halimi@gmail.com> - 2016-12-13 21:50 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-13 22:00 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Andreas Henriksson <andreas@fatal.se> - 2016-12-13 22:20 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Raphaël Halimi <raphael.halimi@gmail.com> - 2016-12-13 23:10 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Andreas Henriksson <andreas@fatal.se> - 2016-12-14 08:30 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Raphaël Halimi <raphael.halimi@gmail.com> - 2016-12-17 05:00 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Nye Liu <nyet@nyet.org> - 2017-02-03 10:50 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Nye Liu <nyet@nyet.org> - 2017-02-03 11:00 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Nye Liu <nyet@nyet.org> - 2017-02-03 11:10 +0100
              Bug#847681: packaging repository and sid diverging? Various fixes needed. Andreas Henriksson <andreas@fatal.se> - 2016-12-13 22:50 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-14 08:20 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Andreas Henriksson <andreas@fatal.se> - 2016-12-14 08:40 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-14 09:50 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Sven Geggus <lists@fuchsschwanzdomain.de> - 2016-12-14 10:40 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-14 11:10 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Sven Geggus <lists@fuchsschwanzdomain.de> - 2016-12-14 12:20 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-14 13:40 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Sven Geggus <lists@fuchsschwanzdomain.de> - 2016-12-15 10:00 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-15 10:00 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Robbie Harwood <rharwood@club.cc.cmu.edu> - 2016-12-15 03:00 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Ben Hutchings <ben@decadent.org.uk> - 2016-12-15 01:40 +0100
              Bug#847681: packaging repository and sid diverging? Various fixes needed. Ben Hutchings <ben@decadent.org.uk> - 2016-12-14 23:50 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-15 11:50 +0100
                Bug#847681: packaging repository and sid diverging? Various fixes needed. Daniel Pocock <daniel@pocock.pro> - 2016-12-15 14:40 +0100

csiph-web