Kolbjørn Stuestøl (Dienstag, 30. Juni 2009, 23:15): > Had some spare minutes tonight and tried your suggestions. > 1. Copied the patch file to the gimp-help-2 on my working copy. > 2. Copied the make_image_links.pl you mailed to gimp-help-2/tools > 3. Ran: $ git am < cygwin-windows-quirks.patch > 4. Output from Cygwin: > … > … > [../] gimp-help-2/.git/rebase-apply/patch:24: trailing whitespace. > " -v | --verbose print number of image files\n" . > error: tools/make_image_links.pl: does not match index > Patch failed at 0001. 2. conflicts with 3. The following procedure should work: 1. git checkout master 2. git checkout -b new-master-copy 3. git am cygwin-windows-quirks.patch 4. git diff ORIG_HEAD > During my reading I found somewhere the following: In Cygwin use > harlinks instead of symlinks. No explanation, but we now know. Good to know that. Bye, Ulf
Attachment:
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ Gimp-docs mailing list Gimp-docs@xxxxxxxxxxxxxxxxxxxxxx https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-docs
