[PATCH wayland-web 1/1] html: Remove trailing whitespace

[Jonas Ådahl]

On Thu, Jun 30, 2016 at 03:38:44PM -0700, Yong Bakos wrote:
> On Jun 30, 2016, at 3:12 AM, Pekka Paalanen <ppaalanen at gmail.com> wrote:
> > 
> > On Tue, 28 Jun 2016 08:52:33 -0500
> > Yong Bakos <junk at humanoriented.com> wrote:
> > 
> >> From: Yong Bakos <ybakos at humanoriented.com>
> >> 
> >> The html files contain trailing whitespace, which is an annoyance when making
> >> a change: editors configured to remove trailing whitespace upon save end up
> >> cluttering the diff beyond the intent of the author.
> >> 
> >> Remove trailing whitespace from all html files, so the annoyance described
> >> above no longer occurs.
> >> 
> >> Signed-off-by: Yong Bakos <ybakos at humanoriented.com>
> >> ---
> >> architecture.html     | 12 +++++-----
> >> building.html         | 12 +++++-----
> >> efl.html              | 10 ++++----
> >> extras.html           | 14 +++++------
> >> faq.html              | 10 ++++----
> >> index.html            | 12 +++++-----
> >> mesa-configure.html   | 18 +++++++-------
> >> qt5.html              | 10 ++++----
> >> releases-archive.html | 14 +++++------
> >> releases.html         | 10 ++++----
> >> reviewing.html        | 66 +++++++++++++++++++++++++--------------------------
> >> screenshots.html      | 12 +++++-----
> >> toolkits.html         | 10 ++++----
> >> ubuntu12.04.html      |  2 +-
> >> xserver.html          | 12 +++++-----
> >> 15 files changed, 112 insertions(+), 112 deletions(-)
> >> 
> > 
> > Hi Yong,
> > 
> > I have trouble applying this patch:
> 
> Hmm, sorry for the inconvenience. But it applies cleanly
> to master/HEAD for me. Using:
> 
> git am 0001-html-Remove-trailing-whitespace.patch
> 
> Also `git apply-patch` successfully adds the diffs without issue.
> 
> Were you sure that your local wayland-web repo was up to date?
> 
> I'll follow up on irc.

After doubting both git, math and SMTP admins, we eventually figured out
what had gone wrong: subject editing of .patch file in an editor that
automatically strips whitespace can sometimes cause funny issues.

Pushed (with Bryce's RB) and depolyed.

   47348ac..d03d14c  master -> master


Jonas

> 
> Thank you,
> yong
> 
> 
> > Applying: html: Remove trailing whitespace
> > Using index info to reconstruct a base tree...
> > error: patch failed: architecture.html:1
> > error: architecture.html: patch does not apply
> > error: patch failed: building.html:1
> > error: building.html: patch does not apply
> > error: patch failed: efl.html:1
> > error: efl.html: patch does not apply
> > error: patch failed: extras.html:1
> > error: extras.html: patch does not apply
> > error: patch failed: faq.html:1
> > error: faq.html: patch does not apply
> > error: patch failed: index.html:1
> > error: index.html: patch does not apply
> > error: patch failed: mesa-configure.html:1
> > error: mesa-configure.html: patch does not apply
> > error: patch failed: qt5.html:1
> > error: qt5.html: patch does not apply
> > error: patch failed: releases-archive.html:1
> > error: releases-archive.html: patch does not apply
> > error: patch failed: releases.html:1
> > error: releases.html: patch does not apply
> > error: patch failed: reviewing.html:1
> > error: reviewing.html: patch does not apply
> > error: patch failed: screenshots.html:1
> > error: screenshots.html: patch does not apply
> > error: patch failed: toolkits.html:1
> > error: toolkits.html: patch does not apply
> > error: patch failed: ubuntu12.04.html:303
> > error: ubuntu12.04.html: patch does not apply
> > error: patch failed: xserver.html:1
> > error: xserver.html: patch does not apply
> > error: Did you hand edit your patch?
> > It does not apply to blobs recorded in its index.
> > Patch failed at 0001 html: Remove trailing whitespace
> > 
> > When I look at the very first hunk in your patch, which I assume is
> > removing a trailing space, the removed line has no trailing space. The
> > file in git master does have a trailing space. It seems like something
> > mangled the patch, but I have no idea what, you seemed to have used
> > git-send-email.
> > 
> > I think it's the same way in Patchwork too.
> > 
> > Could you check what happened?
> > 
> > Otherwise I would've just pushed this one with Bryce's R-b.
> > 
> > 
> > Thanks,
> > pq
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/wayland-devel
> 



> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel