[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Abstract Grob property storage into Mutable_properties. (issue 56164
From: |
hanwenn |
Subject: |
Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden) |
Date: |
Mon, 13 Apr 2020 09:09:14 -0700 |
On 2020/04/13 16:03:00, hahnjo wrote:
> On 2020/04/13 15:06:16, hanwenn wrote:
> >
https://codereview.appspot.com/561640043/diff/565900043/lily/grob-scheme.cc
> > File lily/grob-scheme.cc (left):
> >
> >
>
https://codereview.appspot.com/561640043/diff/565900043/lily/grob-scheme.cc#oldcode326
> > lily/grob-scheme.cc:326:
> > On 2020/04/13 14:56:45, hahnjo wrote:
> > > This should very probably not be part of this patch?
> >
> > It's part https://codereview.appspot.com/549840044/ ; removing it
here as well
> > was the most expedient way of dealing with a potential merge
conflict.
>
> Ah, I missed that the function is referencing one of the changed
properties in
> the return statement. You'll probably still run into merge conflicts,
unless you
> hold off pushing the linked patch until this change has counted down.
I since both patches delete the code, I think it will merge cleanly.
https://codereview.appspot.com/561640043/
- Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), jonas . hahnfeld, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), lemzwerg, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), hanwenn, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), hanwenn, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), jonas . hahnfeld, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden),
hanwenn <=
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), nine . fierce . ballads, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), hanwenn, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), nine . fierce . ballads, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), jonas . hahnfeld, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), dak, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), hanwenn, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), hanwenn, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), dak, 2020/04/13
- Re: Abstract Grob property storage into Mutable_properties. (issue 561640043 by address@hidden), hanwenn, 2020/04/17