On 06/01/2010 09:21 AM, [email protected] wrote:
AVRO-496. python sample_http_client.py is broken (Jeff Hodges via hammer)Modified: avro/branches/branch-1.3/CHANGES.txt avro/branches/branch-1.3/lang/py/test/sample_http_client.py
When merging something from trunk you should indicate that in the commit message. The commit message format used in Hadoop is, "Merge rXXX from trunk to branch-1.3. Fixes AVRO-YYY."
Are you using 'svn merge' for these? Since subversion 1.5 that should keep track of revisions done with 'svn merge', perhaps obviating the need to mention them in the commit message, but I see no 'svn mergeinfo' for the 1.3 branch, so I'm guessing you're not.
Also, you should update trunk's CHANGES.txt so that these changes show up in the 1.3.3 section there and no longer in the 1.4.0 section.
Doug
