On Sun, Dec 16, 2018 at 9:08 PM Makoto Kato wrote:
> Hi,
>
> Is Objective-C++ (*.mm) still old format? Or Should I file a bug for it?
>
We didn't include Objective-C++ in the initial reformatting of the tree
mostly to avoid scope creep, but clang-format is well capable of formatting
it.
Hi,
Is Objective-C++ (*.mm) still old format? Or Should I file a bug for it?
-- Makoto
On Thu, Nov 29, 2018 at 9:38 PM Sylvestre Ledru
wrote:
> Hello,
>
> As Ehsan announced recently, we are going to reformat Friday 30 November.
> In order to mitigate the impact on the uplifts process, we
>>If I'm understanding your situation correctly, I believe you can use rebase
>>to update a whole queue of dependent patches, provided you have the
>>format-source extension enabled.
Ok. For anyone with mq patch queues, here's a sequence that should
work. I hit a problem, and will file a bug on
On Thu, Dec 13, 2018 at 6:05 PM Randell Jesup wrote:
> >> tl;dr: I need to figure out how I'm going to dig out of the rebasing
> hole
> >> I'm now in, and could use advice/help, and I think the above sequence
> >> doesn't work for queues of dependent patches.
> >
> >If I'm understanding your
>> tl;dr: I need to figure out how I'm going to dig out of the rebasing hole
>> I'm now in, and could use advice/help, and I think the above sequence
>> doesn't work for queues of dependent patches.
>
>If I'm understanding your situation correctly, I believe you can use rebase
>to update a whole
On 13/12/2018 14:52, Randell Jesup wrote:
But still all is not lost here. When you do decide to do the manual
merging when you needed those patches, you would need to:
* Update your working tree to the parent of the commit that did the
reformat.
* Apply your patch to that tree and reformat
>But still all is not lost here. When you do decide to do the manual
>merging when you needed those patches, you would need to:
>
> * Update your working tree to the parent of the commit that did the
>reformat.
> * Apply your patch to that tree and reformat the tree.
> * Diff the reformat
On Thu, Nov 29, 2018 at 10:47 PM Emilio Cobos Álvarez
wrote:
> On 11/30/18 2:06 AM, Ehsan Akhgari wrote:
> > On Thu, Nov 29, 2018 at 9:43 AM Emilio Cobos Álvarez
> > wrote:
> >
> >> On 11/29/18 1:38 PM, Sylvestre Ledru wrote:
> >>> This extension will automatically rebase the local changes to
On 11/30/18 2:06 AM, Ehsan Akhgari wrote:
On Thu, Nov 29, 2018 at 9:43 AM Emilio Cobos Álvarez
wrote:
On 11/29/18 1:38 PM, Sylvestre Ledru wrote:
This extension will automatically rebase the local changes to avoid
conflicts.
Is there a way to do the same for cinnabar users?
Yes! Sorry
On Thu, Nov 29, 2018 at 9:43 AM Emilio Cobos Álvarez
wrote:
> On 11/29/18 1:38 PM, Sylvestre Ledru wrote:
> > This extension will automatically rebase the local changes to avoid
> > conflicts.
>
> Is there a way to do the same for cinnabar users?
>
Yes! Sorry for the delay...
Please check out
On Thu, Nov 29, 2018 at 12:20 PM Boris Zbarsky wrote:
> On 11/29/18 11:40 AM, Ehsan Akhgari wrote:
> > Yes, that is true sadly. But to be fair here, old mq patches that do not
> > apply due to age are already beyond saving with any kind of automated
> > tooling, and they require manual work to
On 11/29/2018 04:38 AM, Sylvestre Ledru wrote:
The experimentation with dom/media highlighted that we need an
efficient way to automatically rebase patches before the merge.
To achieve this, we updated the bootstrap process to include an
extension called hg formatsource.
This extension will
On 11/29/18 11:40 AM, Ehsan Akhgari wrote:
Yes, that is true sadly. But to be fair here, old mq patches that do not
apply due to age are already beyond saving with any kind of automated
tooling, and they require manual work to get them applied first. :-/
Sure.
That's not true.
On 11/29/18 11:40 AM, Ehsan Akhgari wrote:
Yes, that is true sadly. But to be fair here, old mq patches that do not
apply due to age are already beyond saving with any kind of automated
tooling, and they require manual work to get them applied first. :-/
Sure.
That's not true.
This short guide should be helpful for Mercurial users:
https://docs.google.com/document/d/13AwAsvKMhH0mflDlfatBqn6LmZHiQih76oxM4zfrPl4
On Thu, Nov 29, 2018 at 11:49 AM Ehsan Akhgari
wrote:
> On Thu, Nov 29, 2018 at 11:44 AM Honza Bambas wrote:
>
>> On 2018-11-29 17:12, Ehsan Akhgari wrote:
>>
On 2018-11-29 17:49, Ehsan Akhgari wrote:
> No, I didn't. :-) That's exactly what the hg-formatsource extension
does for you, it reformats your local changes on the fly as the rebase
is in progress, so you will get no collisions.
\o/
No, those are old days and long gone, my friend. We
On Thu, Nov 29, 2018 at 8:44 AM Honza Bambas wrote:
> OTOH, if the changes are only whitespace changes, maybe there is some
> way `patch --ignore-whitespace --fuzz N` could apply the patches. Then
> just re-format and your patches are OK.
>
The changes that clang-format makes include things
On Thu, Nov 29, 2018 at 11:44 AM Honza Bambas wrote:
> On 2018-11-29 17:12, Ehsan Akhgari wrote:
> > On Thu, Nov 29, 2018 at 8:00 AM Boris Zbarsky wrote:
> >
> >> On 11/29/18 7:38 AM, Sylvestre Ledru wrote:
> >>> This extension will automatically rebase the local changes to avoid
> >>>
On 2018-11-29 17:12, Ehsan Akhgari wrote:
On Thu, Nov 29, 2018 at 8:00 AM Boris Zbarsky wrote:
On 11/29/18 7:38 AM, Sylvestre Ledru wrote:
This extension will automatically rebase the local changes to avoid
conflicts.
Sylvestre,
Will it also update mq patches, or just in-repo commits?
I
On Thu, Nov 29, 2018 at 11:30 AM Boris Zbarsky wrote:
> On 11/29/18 11:12 AM, Ehsan Akhgari wrote:
> >* Pull from a pre-reformat of the tree, run ./mach bootstrap to
> install
> > hg-formatsource.
> >* Do a one-time translation of your mq queue to a set of commits.
> >* Pull from
On 11/29/18 11:12 AM, Ehsan Akhgari wrote:
* Pull from a pre-reformat of the tree, run ./mach bootstrap to install
hg-formatsource.
* Do a one-time translation of your mq queue to a set of commits.
* Pull from hg.mozilla.org to pick up the reformat commit.
* Do a one-time translation
On Thu, Nov 29, 2018 at 4:38 AM Sylvestre Ledru
wrote:
> The experimentation with dom/media highlighted that we need an efficient
> way to automatically rebase patches before the merge.
> To achieve this, we updated the bootstrap process to include an extension
> called hg formatsource.
> This
On Thu, Nov 29, 2018 at 8:00 AM Boris Zbarsky wrote:
> On 11/29/18 7:38 AM, Sylvestre Ledru wrote:
> > This extension will automatically rebase the local changes to avoid
> > conflicts.
>
> Sylvestre,
>
> Will it also update mq patches, or just in-repo commits?
>
I don't think this extension is
On 11/29/18 1:38 PM, Sylvestre Ledru wrote:
This extension will automatically rebase the local changes to avoid
conflicts.
Is there a way to do the same for cinnabar users?
-- Emilio
___
dev-platform mailing list
dev-platform@lists.mozilla.org
On 11/29/18 7:38 AM, Sylvestre Ledru wrote:
This extension will automatically rebase the local changes to avoid
conflicts.
Sylvestre,
Will it also update mq patches, or just in-repo commits?
-Boris
___
dev-platform mailing list
Hello,
As Ehsan announced recently, we are going to reformat Friday 30 November.
In order to mitigate the impact on the uplifts process, we choose this date
before the merge day.
In term of execution, we will close the trees Friday around 8am Paris/Berlin
time (11pm PST).
We will then merge
26 matches
Mail list logo
