Re: DO NOT REPLY [Bug 24463] - [PATCH] Petstore sample: bug fixes + completions

[David Crossley <cr...@indexgeo.com.au>]

bugzilla wrote:
> http://nagoya.apache.org/bugzilla/show_bug.cgi?id=24463
> 
> ------- Additional Comments From Leo Leonid  2003-11-11 16:03 -------
> David, looks like the patch is not correclty applied. 
> The sitemap looks horrible ATM and is not wellformed.

It sounds like you have been bitten by the 'cvs update' gotcha.
Whenever a committer accepts a patch, then they may make their
own tweaks to the code. They may even totally re-write some sections.

When you, the contributor, does their 'cvs update' then they need
to be doubly sure to check for "conflict" messages.

Anyway, your sitemap may have had conflict markers inserted by cvs
to deliberately break your copy.

As you did, the best way is to delete your offending files and
do the update again.

> I'm not so experieced creating diffs, ...<snip/>

On the contrary. Your diff was fine. The trouble was the update.

--David