Uploaded image for project: 'Skara'
  1. Skara
  2. SKARA-1711

File rename not applied in patch generated by skara

XMLWordPrintable

    • Icon: Bug Bug
    • Resolution: External
    • Icon: P4 P4
    • None
    • None
    • libraries
    • None

      I applied a webrev patch generated by skara which contained (in part)

      diff --git a/test/jdk/java/awt/font/MacEmoji.java b/test/jdk/java/awt/font/Emoji.java
      similarity index 91%
      rename from test/jdk/java/awt/font/MacEmoji.java
      rename to test/jdk/java/awt/font/Emoji.java
      index 198db5c107fb..b44c68db7caa 100644
      --- a/test/jdk/java/awt/font/MacEmoji.java
      +++ b/test/jdk/java/awt/font/Emoji.java


      The diffs were applied correctly to this pre-existing test file HOWEVER
      the file did not get renamed.

      It was patched using macOS 12.6.1's /usr/bin/patch
      ---
      patch -v
      patch 2.5.8
      Copyright (C) 1988 Larry Wall
      Copyright (C) 2002 Free Software Foundation, Inc.

      This program comes with NO WARRANTY, to the extent permitted by law.
      You may redistribute copies of this program
      under the terms of the GNU General Public License.
      For more information about these matters, see the file named COPYING.

      written by Larry Wall and Paul Eggert
      --
       as
      patch -p 1 -i skaras_patch.diff

      No errors

      patching file src/java.desktop/macosx/classes/sun/font/CCharToGlyphMapper.java
      patching file src/java.desktop/macosx/classes/sun/font/CCompositeGlyphMapper.jav
      ...
      ...
      ...
      patching file test/jdk/java/awt/font/ComplexEmoji.java
      patching file test/jdk/java/awt/font/MacEmoji.java
      patching file test/jdk/java/awt/font/EmojiVariation.java
      patching file test/jdk/java/awt/font/OutlineTextRendererEmoji.java

            Unassigned Unassigned
            prr Philip Race
            Votes:
            0 Vote for this issue
            Watchers:
            2 Start watching this issue

              Created:
              Updated:
              Resolved: