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

Groups > linux.debian.maint.python > #11106 > unrolled thread

Bug#914230: ITP: git-imerge -- incremental merge and rebase for git

Back to article view | Back to linux.debian.maint.python

Contents

  Bug#914230: ITP: git-imerge -- incremental merge and rebase for git James Clarke <jrtc27@debian.org> - 2018-11-20 20:40 +0100
    Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) James Clarke <jrtc27@debian.org> - 2018-11-22 01:40 +0100
      Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Chris Lamb <lamby@debian.org> - 2018-11-22 10:50 +0100
        Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) James Clarke <jrtc27@debian.org> - 2018-11-22 11:00 +0100
        Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Ondrej Novy <novy@ondrej.org> - 2018-11-22 13:40 +0100
          Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Chris Lamb <lamby@debian.org> - 2018-11-22 14:30 +0100
      Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge --  incremental merge and rebase for git) Ondrej Novy <novy@ondrej.org> - 2018-11-27 16:20 +0100

#11106 — Bug#914230: ITP: git-imerge -- incremental merge and rebase for git

Package: wnpp
Severity: wishlist
Owner: James Clarke <jrtc27@debian.org>

* Package name    : git-imerge
  Version         : 1.1.0
  Upstream Author : Michael Haggerty <mhagger@alum.mit.edu>
* URL             : https://github.com/mhagger/git-imerge
* License         : GPLv2+
  Programming Lang: Python
  Description     : incremental merge and rebase for git

Performs a merge between two branches incrementally. If conflicts are
encountered, figures out exactly which pairs of commits conflict, and
presents the user with one pairwise conflict at a time for resolution.

I recently discovered this useful tool and now use it for my day-to-day
work dealing with forks of large upstream projects. I intend to maintain
this as part of PAPT (which I've just found out is open to all DDs,
though out of courtesy I've still Cc'ed debian-python).

Regards,
James

[toc] | [next] | [standalone]

#11111 — Request to join PAPT (Was: Bug#914230: ITP: git-imerge -- incremental merge and rebase for git)

On Tue, Nov 20, 2018 at 07:37:49PM +0000, James Clarke wrote:
> Package: wnpp
> Severity: wishlist
> Owner: James Clarke <jrtc27@debian.org>
>
> * Package name    : git-imerge
>   Version         : 1.1.0
>   Upstream Author : Michael Haggerty <mhagger@alum.mit.edu>
> * URL             : https://github.com/mhagger/git-imerge
> * License         : GPLv2+
>   Programming Lang: Python
>   Description     : incremental merge and rebase for git
>
> Performs a merge between two branches incrementally. If conflicts are
> encountered, figures out exactly which pairs of commits conflict, and
> presents the user with one pairwise conflict at a time for resolution.
>
> I recently discovered this useful tool and now use it for my day-to-day
> work dealing with forks of large upstream projects. I intend to maintain
> this as part of PAPT (which I've just found out is open to all DDs,
> though out of courtesy I've still Cc'ed debian-python).

Hi,
It turns out policy.rst is lying, I don't have permission to create a
repository. Therefore I would like to request to join PAPT, please (and
accept the policy even in spite of its lies).

Thanks,
James

[toc] | [prev] | [next] | [standalone]

#11115 — Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge -- incremental merge and rebase for git)

James Clarke wrote:

> It turns out policy.rst is lying, I don't have permission to create a
> repository. Therefore I would like to request to join PAPT, please (and
> accept the policy even in spite of its lies).

Python team, can we merge the pending Policy changes? It's getting
a little frustrating reading these (or similar; not sure if this
particular case is addressed…)


Best wishes,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby@debian.org / chris-lamb.co.uk
       `-

[toc] | [prev] | [next] | [standalone]

#11116 — Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge -- incremental merge and rebase for git)

On 22 Nov 2018, at 08:48, Chris Lamb <lamby@debian.org> wrote:
> 
> James Clarke wrote:
> 
>> It turns out policy.rst is lying, I don't have permission to create a
>> repository. Therefore I would like to request to join PAPT, please (and
>> accept the policy even in spite of its lies).
> 
> Python team, can we merge the pending Policy changes? It's getting
> a little frustrating reading these (or similar; not sure if this
> particular case is addressed…)

Ah, it has been addressed in tools/python-modules's policy.rst, but the PAPT
policy was forked from this in tools/python-apps and is missing the subsequent
changes. I'll see about consolidating the changes later if nobody beats me to
it.

Regards,
James

[toc] | [prev] | [next] | [standalone]

#11117 — Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge -- incremental merge and rebase for git)

[Multipart message — attachments visible in raw view] — view raw

Hi,

čt 22. 11. 2018 v 10:47 odesílatel Chris Lamb <lamby@debian.org> napsal:

> > It turns out policy.rst is lying, I don't have permission to create a
> > repository. Therefore I would like to request to join PAPT, please (and
> > accept the policy even in spite of its lies).
>
> Python team, can we merge the pending Policy changes? It's getting
> a little frustrating reading these (or similar; not sure if this
> particular case is addressed…)
>

https://salsa.debian.org/python-team/tools/python-apps/merge_requests

I don't see any merge requests for PAPT.

For DPMT I see only one (really huge) merge request:
https://salsa.debian.org/python-team/tools/python-modules/merge_requests/2

I think it's better to do smaller changes/merge request. mwei, can you
split it to more smaller merge requests please?

-- 
Best regards
 Ondřej Nový

Email: novy@ondrej.org
PGP: 3D98 3C52 EB85 980C 46A5  6090 3573 1255 9D1E 064B

[toc] | [prev] | [next] | [standalone]

#11118 — Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge -- incremental merge and rebase for git)

Dear Ondrej,

> I don't see any merge requests for PAPT.

Mea culpa; I misread this as DPMT as you have inferred.

> I think it's better to do smaller changes/merge request. mwei, can you
> split it to more smaller merge requests please?

I would obviously heartily endorse this philosophy but I wonder
that for expediency and to correct the now long-incorrect
information I suggest we adjust our tolerance here. However, Mwei
please do indeed split these into smaller MRs or commits.


Best wishes,

-- 
      ,''`.
     : :'  :     Chris Lamb
     `. `'`      lamby@debian.org / chris-lamb.co.uk
       `-

[toc] | [prev] | [next] | [standalone]

#11134 — Re: Request to join PAPT (Was: Bug#914230: ITP: git-imerge -- incremental merge and rebase for git)

[Multipart message — attachments visible in raw view] — view raw

Hi,

čt 22. 11. 2018 v 1:36 odesílatel James Clarke <jrtc27@debian.org> napsal:

> It turns out policy.rst is lying, I don't have permission to create a
> repository. Therefore I would like to request to join PAPT, please (and
> accept the policy even in spite of its lies).
>

welcome :)

-- 
Best regards
 Ondřej Nový

Email: novy@ondrej.org
PGP: 3D98 3C52 EB85 980C 46A5  6090 3573 1255 9D1E 064B

[toc] | [prev] | [standalone]

Back to top | Article view | linux.debian.maint.python

csiph-web