* [devel] git-apply
@ 2006-10-18 21:44 Alexey Tourbin
2006-10-19 5:30 ` Damir Shayhutdinov
0 siblings, 1 reply; 4+ messages in thread
From: Alexey Tourbin @ 2006-10-18 21:44 UTC (permalink / raw)
To: devel
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [devel] git-apply
2006-10-18 21:44 [devel] git-apply Alexey Tourbin
@ 2006-10-19 5:30 ` Damir Shayhutdinov
2006-10-19 8:25 ` Sergey Vlasov
2006-10-19 13:42 ` Alexey Tourbin
0 siblings, 2 replies; 4+ messages in thread
From: Damir Shayhutdinov @ 2006-10-19 5:30 UTC (permalink / raw)
To: ALT Devel discussion list
> 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
> $
Не могу его в этом винить, я бы тоже не стал прикладывать патчи с
оффсетом в 113 строк.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [devel] git-apply
2006-10-19 5:30 ` Damir Shayhutdinov
@ 2006-10-19 8:25 ` Sergey Vlasov
2006-10-19 13:42 ` Alexey Tourbin
1 sibling, 0 replies; 4+ messages in thread
From: Sergey Vlasov @ 2006-10-19 8:25 UTC (permalink / raw)
To: ALT Devel discussion list
[-- Attachment #1: Type: text/plain, Size: 865 bytes --]
On Thu, Oct 19, 2006 at 09:30:04AM +0400, Damir Shayhutdinov wrote:
> > 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
> > $
> Не могу его в этом винить, я бы тоже не стал прикладывать патчи с
> оффсетом в 113 строк.
Offset он как раз понимает нормально, а вот fuzz принципиально не
переносит. Можно, правда, покрутить опцию -C.
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [devel] git-apply
2006-10-19 5:30 ` Damir Shayhutdinov
2006-10-19 8:25 ` Sergey Vlasov
@ 2006-10-19 13:42 ` Alexey Tourbin
1 sibling, 0 replies; 4+ messages in thread
From: Alexey Tourbin @ 2006-10-19 13:42 UTC (permalink / raw)
To: ALT Devel discussion list
[-- Attachment #1: Type: text/plain, Size: 839 bytes --]
On Thu, Oct 19, 2006 at 09:30:04AM +0400, Damir Shayhutdinov wrote:
> > 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
> > $
> Не могу его в этом винить, я бы тоже не стал прикладывать патчи с
> оффсетом в 113 строк.
Хочешь сказать Ларри Уолл был дурак, а то что теперь патчи
не приклыдваются это круто?
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2006-10-19 13:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-10-18 21:44 [devel] git-apply Alexey Tourbin
2006-10-19 5:30 ` Damir Shayhutdinov
2006-10-19 8:25 ` Sergey Vlasov
2006-10-19 13:42 ` Alexey Tourbin
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