Hi Phillip,
On Mon, 3 Jun 2019, Phillip Wood wrote:
> On 03/06/2019 14:40, Johannes Schindelin wrote:
> >
> > On Sun, 2 Jun 2019, Phillip Wood wrote:
> >
> > > On 22/03/2019 14:06, Johannes Schindelin wrote:
> > >
> > > > On Thu, 13 Sep 2018, Phillip Wood wrote:
> > > >
> > > > > On 03/09/2018 20
Hi
On 03/06/2019 14:40, Johannes Schindelin wrote:
Hi Phillip,
On Sun, 2 Jun 2019, Phillip Wood wrote:
On 22/03/2019 14:06, Johannes Schindelin wrote:
On Thu, 13 Sep 2018, Phillip Wood wrote:
On 03/09/2018 20:01, Jochen Sprickerhof wrote:
* Phillip Wood [2018-08-30 14:47]:
We could r
Hi Phillip,
On Sun, 2 Jun 2019, Phillip Wood wrote:
> On 22/03/2019 14:06, Johannes Schindelin wrote:
>
> > On Thu, 13 Sep 2018, Phillip Wood wrote:
> >
> > > On 03/09/2018 20:01, Jochen Sprickerhof wrote:
> > >
> > > > * Phillip Wood [2018-08-30 14:47]:
> > > >
> > > > > We could restore the ol
Hi Dscho
Sorry it's taken me so long to get round to replying to this
On 22/03/2019 14:06, Johannes Schindelin wrote:
Hi,
On Thu, 13 Sep 2018, Phillip Wood wrote:
On 03/09/2018 20:01, Jochen Sprickerhof wrote:
* Phillip Wood [2018-08-30 14:47]:
When $newhunk is created it is marked as d
Hi,
On Thu, 13 Sep 2018, Phillip Wood wrote:
> On 03/09/2018 20:01, Jochen Sprickerhof wrote:
>
> > * Phillip Wood [2018-08-30 14:47]:
> >> When $newhunk is created it is marked as dirty to prevent
> >> coalesce_overlapping_hunks() from coalescing it. This patch does not
> >> change that. What i
* Phillip Wood [2018-09-13 11:20]:
Yes in the long term we want to be able to coalesce edited hunks, but I
think it is confusing to call coalesce_overlapping_hunks() at the moment
as it will not coalesce the edited hunks.
I would see it as a first step into that direction.
I think that if yo
Hi Jochen
On 03/09/2018 20:01, Jochen Sprickerhof wrote:
> Hi Phillip,
>
> * Phillip Wood [2018-08-30 14:47]:
>> When $newhunk is created it is marked as dirty to prevent
>> coalesce_overlapping_hunks() from coalescing it. This patch does not
>> change that. What is happening is that by calling
Hi Phillip,
* Phillip Wood [2018-08-30 14:47]:
When $newhunk is created it is marked as dirty to prevent
coalesce_overlapping_hunks() from coalescing it. This patch does not
change that. What is happening is that by calling
coalesce_overlapping_hunks() the hunks that are not currently selecte
Phillip Wood writes:
> When $newhunk is created it is marked as dirty to prevent
> coalesce_overlapping_hunks() from coalescing it. This patch does not
> change that. What is happening is that by calling
> coalesce_overlapping_hunks() the hunks that are not currently selected
> are filtered out a
Dear Jochen/Junio
On 28/08/18 19:07, Junio C Hamano wrote:
Jochen Sprickerhof writes:
When a hunk was split before being edited manually, it does not apply
anymore cleanly. Apply coalesce_overlapping_hunks() first to make it
work. Enable test for it as well.
Signed-off-by: Jochen Sprickerhof
Jochen Sprickerhof writes:
> When a hunk was split before being edited manually, it does not apply
> anymore cleanly. Apply coalesce_overlapping_hunks() first to make it
> work. Enable test for it as well.
>
> Signed-off-by: Jochen Sprickerhof
> ---
> git-add--interactive.perl | 8
>
When a hunk was split before being edited manually, it does not apply
anymore cleanly. Apply coalesce_overlapping_hunks() first to make it
work. Enable test for it as well.
Signed-off-by: Jochen Sprickerhof
---
git-add--interactive.perl | 8
t/t3701-add-interactive.sh | 2 +-
2 files c
12 matches
Mail list logo
