cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Shazron <shaz...@gmail.com>
Subject Re: Having issues with git Pull Request
Date Thu, 30 Jan 2014 20:29:32 GMT
Can't see your screenshot, maybe it was auto-removed by the list. It seemed
to work for me? See:

Log:

$ curl https://github.com/apache/cordova-docs/pull/182.patch | git am
  % Total    % Received % Xferd  Average Speed   Time    Time     Time
 Current
                                 Dload  Upload   Total   Spent    Left
 Speed
100 4936k  100 4936k    0     0   602k      0  0:00:08  0:00:08 --:--:--
 893k
Applying: 1/28 push latest of edge for chinese simplified Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:213:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:286:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:295:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:1020:
trailing whitespace.
           http://www.apache.org/licenses/LICENSE-2.0
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:1023:
trailing whitespace.

warning: squelched 388 whitespace errors
warning: 393 lines add whitespace errors.
Applying: 1/28 push latest of edge for Spanish Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:185:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:250:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:259:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:553:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:568:
trailing whitespace.

warning: squelched 382 whitespace errors
warning: 387 lines add whitespace errors.
Applying: 1/28 push latest of edge for French Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:191:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:253:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:262:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:559:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:574:
trailing whitespace.

warning: squelched 386 whitespace errors
warning: 391 lines add whitespace errors.
Applying: 1/28 push latest of edge for German Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:146:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:207:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:216:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:534:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:549:
trailing whitespace.

warning: squelched 385 whitespace errors
warning: 390 lines add whitespace errors.
Applying: 1/28 push latest of edge for Italian Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:145:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:206:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:215:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:543:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:558:
trailing whitespace.

warning: squelched 386 whitespace errors
warning: 391 lines add whitespace errors.
Applying: 1/28 push latest of edge for Japanese Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:145:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:206:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:215:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:543:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:558:
trailing whitespace.

warning: squelched 388 whitespace errors
warning: 393 lines add whitespace errors.
Applying: 1/28 push latest of edge for Chinese Traditional Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:7317:
trailing whitespace.
    *   Windows 8 或 Windows 8 臨
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:7339:
trailing whitespace.
    *   需要支援虛擬化的處理器和 [第二級別位址翻譯 (板式)][1]
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:9045:
trailing whitespace.
這裡是一個清單的預設引擎,'<engine>'標籤支援: * '科爾多瓦' *'
科爾多瓦-plugman' * '科爾多瓦-亞馬遜-fireos'
*' 科爾多瓦-android' * '科爾多瓦-ios' *' 科爾多瓦-blackberry10' * '科爾多瓦-wp7'
*'
科爾多瓦-wp8' * ' 科爾多瓦-windows8'
warning: 3 lines add whitespace errors.
Applying: 1/28 push latest of edge for Russian Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:201:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:268:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:277:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:725:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:740:
trailing whitespace.

warning: squelched 377 whitespace errors
warning: 382 lines add whitespace errors.
Applying: 1/28 push latest of edge for Korean Cordova 3.4
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:161:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:217:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:226:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:511:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:526:
trailing whitespace.

warning: squelched 386 whitespace errors
warning: 391 lines add whitespace errors.
Applying: Cordova 3.4 - broken links due to inconsistent heading translation
/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:300:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:349:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:355:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:374:
trailing whitespace.

/Users/shazron/Documents/Git/Apache/cordova-docs/.git/rebase-apply/patch:382:
trailing whitespace.

warning: squelched 1011 whitespace errors
warning: 1016 lines add whitespace errors.


On Thu, Jan 30, 2014 at 12:23 PM, Lisa Seacat DeLuca <ldeluca@us.ibm.com>wrote:

> I'm trying to pull in the Cordova translations for 3.4 which is pull
> request 182 for docs:  https://github.com/apache/cordova-docs/pull/182
>
> But I'm getting an error with git am "patch does not apply" only for the
> chinese (zh) files.  Unfortunately it's all or nothing so it's not letting
> me at least pull in the other languages.  Anyone know how to get around
> this?
>
> this is my git am command:
> curl https://github.com/apache/cordova-docs/pull/182.patch | git am
>
> Followed these docs:
> http://wiki.apache.org/cordova/IssueWorkflow
> http://wiki.apache.org/cordova/ProcessingPullRequests
>
> Error screen shot:
>
>
> Lisa
>
>
> Lisa Seacat DeLuca
>
> twitter: @LisaSeacat
> website: lisaseacat.com
> kickstarter: arobotstory.com
> ldeluca@apache.org ldeluca@us.ibm.com

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message