| Resolving Patch Conflicts Using Context [message #180639] |
Thu, 16 November 2006 17:14 |
Eclipse User |
|
|
|
Originally posted by: kbrentnell.idrc.ca
Hello,
I am attempting to apply unified patches (Java). Some problem hunks are
flagged with the red exclamation mark, because the code being patch has
been modified and now the line numbers do not match. However, in the
Eclipse Apply Patch Preview Pane the problem hunks are placed in the
correct location using the patch context. I after confirming the problem
hunks are place correctly I put a check mark beside them.
Even so the problem hunks are written out to .rej files and not applied to
the code. If the patches were small, I would fix them by hand, but I have
many large patches to deal with, so manual fixing would be very time
consuming. Is there anyway to make Eclipse apply the problem hunks based
on context and ignore the line numbers?
I have Googled for and answer, and read the Eclipse help but have come up
dry.
I am using Eclipse SDK 3.2.0.
Thank you for your thought about this.
Sincerely,
Kyle
|
|
|
Powered by
FUDForum. Page generated in 0.07911 seconds
] 
Search
Help
Register
Login
Home
