Groups > linux.debian.maint.python > #10771

Re: git-dpm -> gbp conversion (mass-change)

From	Ruben Undheim <lists@beebeetle.com>
Newsgroups	linux.debian.maint.python
Subject	Re: git-dpm -> gbp conversion (mass-change)
Date	2018-08-08 16:00 +0200
Message-ID	<wkxah-70I-7@gated-at.bofh.it> (permalink)
References	<winI5-sq-1@gated-at.bofh.it> <wiyWS-793-9@gated-at.bofh.it> <wiZkl-680-1@gated-at.bofh.it> <wkqVc-3lQ-15@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi,

> The problem with git-debrebase will be the same as with git-dpm. As soon
> as you try to upgrade / merge a new upstream release, you dive into a
> rebase/conflict nightmare.

So in other words, you prefer to solve the same conflicts manually with
quilt/quilt refresh or get similar but worse (I think) rebase conflicts with
"gbp pq rebase"?

There is no nightmare unless there are patch conflicts. All the tools will
in that case give you a nightmare in one way or the other. It is just that some
of them attempt to handle it a bit more elegantly than the others. For people
familar with git (and rebase) - the nightmare should not be bad at all with
git-debrebase.  (personally I solve conflicts  with quilt -f /quilt refresh
when using gbp)..

Cheers,
Ruben

Thread

Report from the Python BoF @ DebConf18 Nicolas Dandrimont <olasd@debian.org> - 2018-08-02 17:30 +0200
  git-dpm -> gbp conversion (mass-change) Ondrej Novy <novy@ondrej.org> - 2018-08-03 05:30 +0200
    Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 06:00 +0200
      Re: git-dpm -> gbp conversion (mass-change) Scott Kitterman <debian@kitterman.com> - 2018-08-03 06:40 +0200
        Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 08:30 +0200
          Re: git-dpm -> gbp conversion (mass-change) Simon McVittie <smcv@debian.org> - 2018-08-03 09:10 +0200
            Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 10:20 +0200
              Re: git-dpm -> gbp conversion (mass-change) "W. Martin Borgert" <debacle@debian.org> - 2018-08-03 10:30 +0200
    Re: git-dpm -> gbp conversion (mass-change) Sandro Tosi <morph@debian.org> - 2018-08-03 15:40 +0200
    Re: git-dpm -> gbp conversion (mass-change) Ruben Undheim <lists@beebeetle.com> - 2018-08-04 09:40 +0200
      Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-08 09:20 +0200
        Re: git-dpm -> gbp conversion (mass-change) Nikolaus Rath <Nikolaus@rath.org> - 2018-08-08 13:40 +0200
          Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-08 16:50 +0200
            Re: git-dpm -> gbp conversion (mass-change) Nikolaus Rath <Nikolaus@rath.org> - 2018-08-08 21:30 +0200
              Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-09 10:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) Ondrej Novy <novy@ondrej.org> - 2018-08-09 11:00 +0200
                Re: git-dpm -> gbp conversion (mass-change) Simon McVittie <smcv@debian.org> - 2018-08-09 12:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) Brian May <bam@debian.org> - 2018-08-09 13:00 +0200
          Re: git-dpm -> gbp conversion (mass-change) Brian May <bam@debian.org> - 2018-08-08 23:50 +0200
        Re: git-dpm -> gbp conversion (mass-change) Ruben Undheim <lists@beebeetle.com> - 2018-08-08 16:00 +0200
          Re: git-dpm -> gbp conversion (mass-change) Thomas Goirand <zigo@debian.org> - 2018-08-08 17:00 +0200
          Re: git-dpm -> gbp conversion (mass-change) Brian May <bam@debian.org> - 2018-08-09 00:00 +0200
    Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-08 16:30 +0200
      Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Scott Kitterman <debian@kitterman.com> - 2018-08-10 22:30 +0200
        Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Scott Kitterman <debian@kitterman.com> - 2018-08-11 16:20 +0200
          Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] eamanu15 <emmanuelarias30@gmail.com> - 2018-08-12 15:30 +0200
            Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Dmitry Shachnev <mitya57@debian.org> - 2018-08-12 20:30 +0200
              Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] eamanu15 <emmanuelarias30@gmail.com> - 2018-08-15 03:10 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Scott Kitterman <debian@kitterman.com> - 2018-08-15 03:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Lars Kruse <lists@sumpfralle.de> - 2018-08-15 04:20 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-15 09:10 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Pierre-Elliott Bécue <becue@crans.org> - 2018-08-15 13:00 +0200
                Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-15 13:20 +0200
        Re: git-dpm -> gbp conversion (mass-change) [phase 1 DONE] Ondrej Novy <novy@ondrej.org> - 2018-08-11 16:20 +0200
  Re: Report from the Python BoF @ DebConf18 Sandro Tosi <morph@debian.org> - 2018-09-19 15:40 +0200
    Re: Report from the Python BoF @ DebConf18 Thomas Goirand <zigo@debian.org> - 2018-09-19 17:40 +0200
    Upstreams dropping Python 2 support (Was: Re: Report from the Python  BoF @ DebConf18) Dmitry Shachnev <mitya57@debian.org> - 2018-09-27 12:00 +0200
      Re: Upstreams dropping Python 2 support Ole Streicher <olebole@debian.org> - 2018-09-27 12:20 +0200
        Re: Upstreams dropping Python 2 support Dmitry Shachnev <mitya57@debian.org> - 2018-09-27 13:30 +0200
        Re: Upstreams dropping Python 2 support Simon McVittie <smcv@debian.org> - 2018-09-27 15:20 +0200

csiph-web