|
| From: | Paul Jarc |
| Subject: | Re: complex patch/diff usage |
| Date: | Thu, 29 Jul 2004 02:04:13 -0400 |
| User-agent: | Gnus/5.110003 (No Gnus v0.3) Emacs/21.3 (gnu/linux) |
"Ian Stevenson" <ianstevenson@hotmail.com> wrote: > patching file A11 > Hunk #1 FAILED at 335. > 1 out of 1 hunk FAILED -- saving rejects to file A11.rej That's to be expected if the branches had changes in the same lines. patch (and version control tools) can only do so much. paul
| [Prev in Thread] | Current Thread | [Next in Thread] |