Use git. Managing patches is an order of magnitude easier. On Thu, Jan 12, 2012 at 6:40 PM, Chris Hostetter <[email protected]> wrote: > > : This only affected trunk. The problem was that I managed to apply the > : patch multiple times after I ran the tests before checking in the > : first time. I do not understand why patch will append content if you > : apply the same patch repeatedly, but there it is. > > it's because the patch command doesn't know about adding new files -- > patches that add new files are essentially just instructions replace line > 0 with a bunch of lines ... so no conflict bells go off if you apply the > patch multiple times (the file just keeps growing) > > -Hoss > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] >
-- Lance Norskog [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
