From: Alexey Tourbin <at@altlinux.ru>
To: devel@lists.altlinux.org
Subject: [devel] git-apply
Date: Thu, 19 Oct 2006 01:44:05 +0400
Message-ID: <20061018214405.GQ11317@localhost.localdomain> (raw)
[-- Attachment #1: Type: text/plain, Size: 531 bytes --]
git-apply не хочет прикладывать некоторые патчи, которые нормально
прикладывает patch.
$ patch -p1 --dry-run <~sources/zsh-4.0.4-rh-serial.patch
patching file Src/builtin.c
Hunk #1 succeeded at 4591 (offset 1102 lines).
patching file Src/init.c
Hunk #1 succeeded at 402 (offset 5 lines).
Hunk #2 succeeded at 443 (offset 5 lines).
Hunk #3 succeeded at 1348 with fuzz 1 (offset 113 lines).
$ git-apply ~sources/zsh-4.0.4-rh-serial.patch
error: patch failed: Src/init.c:1235
error: Src/init.c: patch does not apply
$
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2006-10-18 21:44 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-18 21:44 Alexey Tourbin [this message]
2006-10-19 5:30 ` Damir Shayhutdinov
2006-10-19 8:25 ` Sergey Vlasov
2006-10-19 13:42 ` Alexey Tourbin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061018214405.GQ11317@localhost.localdomain \
--to=at@altlinux.ru \
--cc=devel@lists.altlinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
ALT Linux Team development discussions
This inbox may be cloned and mirrored by anyone:
git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
public-inbox-index devel
Example config snippet for mirrors.
Newsgroup available over NNTP:
nntp://lore.altlinux.org/org.altlinux.lists.devel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git