Project

General

Profile

Bug #7067

webrev adds spurious path component to top-level files

Added by Robert Mustacchi over 4 years ago. Updated over 4 years ago.

Status:
Closed
Priority:
Normal
Assignee:
Joshua M. Clulow
Category:
tools - gate/build tools
Start date:
2016-06-06
Due date:
% Done:

100%

Estimated time:
Difficulty:
Medium
Tags:
Gerrit CR:

Description

the failure:

$ git apply ~/Downloads/TOOLS-1406.patch
fatal: invalid path './package.json'

the fix was to edit the patch as follows:

$ diff -u TOOLS-1406.patch TOOLS-1406-gittified.patch
--- TOOLS-1406.patch    2016-04-06 12:02:02.000000000 -0700
+++ TOOLS-1406-gittified.patch    2016-04-06 12:01:49.000000000 -0700
@@ -620,8 +620,8 @@
 +    updateSizeParameters: updateSizeParameters
 +};
 +/* vim: set ts=4 sts=4 sw=4 et: */
---- old/./package.json    2016-03-31 23:56:19.640150808 +0000
-+++ new/./package.json    2016-03-31 23:56:19.655832092 +0000
+--- old/package.json    2016-03-31 23:56:19.640150808 +0000
++++ new/package.json    2016-03-31 23:56:19.655832092 +0000
 @@ -6,12 +6,12 @@
    "private": true,
    "dependencies": {
#1

Updated by Electric Monk over 4 years ago

  • Status changed from New to Closed

git commit 3d7afa3319dd88bd8a1774d43c1b15bce28b0f80

commit  3d7afa3319dd88bd8a1774d43c1b15bce28b0f80
Author: Joshua M. Clulow <jmc@joyent.com>
Date:   2016-06-10T06:23:28.000Z

    7067 webrev adds spurious path component to top-level files
    Reviewed by: Richard Lowe <richlowe@richlowe.net>
    Reviewed by: Yuri Pankov <yuri.pankov@nexenta.com>
    Reviewed by: Garrett D'Amore <garrett@damore.org>
    Approved by: Garrett D'Amore <garrett@damore.org>

Also available in: Atom PDF