From: Junio C Hamano <junkio@cox.net>
To: Robert Fitzsimons <robfitz@273k.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 1/9] Fix git patch header processing in git-apply.
Date: Sun, 28 Aug 2005 16:39:12 -0700 [thread overview]
Message-ID: <7vslwtein3.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: 11252426672473-git-send-email-robfitz@273k.net
Thanks for "apply" patches. I have merged some of them and
pushed out.
I further wanted to apply the following to the proposed updates
branch, but even with only the first one applied, it fails its
own test, t4104-apply-complex.sh:
* Fix processing of a patch file which modifies the same file in git-apply.
* Fix the processing of multiple patch files with --check in git-apply.
* New option --ignore-whitespace for git-apply.
* New option --ignore-applied for git-apply.
*** t4104-apply-complex.sh ***
* FAIL 5: S = Nx Px1
cat Nx Px1 | git-apply -
* FAIL 6: S = Nx Px1 Px2
cat Nx Px1 Px2 | git-apply -
* FAIL 7: S = Nx Px1 Px2 Px3
cat Nx Px1 Px2 Px3 | git-apply -
* FAIL 8: S = Nx Px1 Px2 Px3 Dx
cat Nx Px1 Px2 Px3 Dx | git-apply -
* FAIL 13: S = Ny Ryx Px1 Px2 Cxy Px3 Dx
cat Ny Ryx Px1 Px2 Cxy Px3 Dx | git-apply -
* FAIL 14: S = Ny Ryx Px1 Px2 Cxy Px3 Dx Cyx
cat Ny Ryx Px1 Px2 Cxy Px3 Dx Cyx | git-apply -
* FAIL 15: S = Ny Cyx Px1 Px2 Px3 Dy Cxy Dx Cyx Dy Rxy Dy
cat Ny Cyx Px1 Px2 Px3 Dy Cxy Dx Cyx Dy Rxy Dy| git-apply -
next prev parent reply other threads:[~2005-08-28 23:39 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-08-28 15:24 [PATCH 1/9] Fix git patch header processing in git-apply Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 2/9] Fix detection of files with only one line " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 3/9] Fix processing of a patch file which modifies the same file " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 4/9] Fix the procssing of multiple patch files with --check " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 5/9] New option --force-delete for git-apply Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 6/9] New option --ignore-whitespace " Robert Fitzsimons
2005-08-28 15:24 ` [PATCH 7/9] New option --ignore-applied " Robert Fitzsimons
2005-08-28 15:25 ` [PATCH 8/9] New git-apply test cases for patches with mulitple fragments Robert Fitzsimons
2005-08-28 15:25 ` [PATCH 9/9] New git-apply test cases for scanning forwards and backwards Robert Fitzsimons
2005-08-28 16:58 ` [PATCH 6/9] New option --ignore-whitespace for git-apply Linus Torvalds
2005-08-28 20:49 ` A Large Angry SCM
2005-08-28 21:06 ` Junio C Hamano
2005-08-28 21:06 ` [PATCH 5/9] New option --force-delete " Junio C Hamano
2005-08-28 21:06 ` [PATCH 3/9] Fix processing of a patch file which modifies the same file in git-apply Junio C Hamano
2005-08-28 16:55 ` [PATCH 2/9] Fix detection of files with only one line " Linus Torvalds
2005-08-28 23:39 ` Junio C Hamano [this message]
2005-08-29 23:58 ` [PATCH 1/9] Fix git patch header processing " Robert Fitzsimons
2005-08-30 0:47 ` Linus Torvalds
2005-08-30 1:09 ` Junio C Hamano
2005-08-30 1:24 ` Linus Torvalds
2005-08-30 1:34 ` Junio C Hamano
2005-08-30 2:00 ` Linus Torvalds
2005-08-30 7:36 ` Martin Langhoff
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=7vslwtein3.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=git@vger.kernel.org \
--cc=robfitz@273k.net \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.