[PATCH] Tree conflict detection doc clarification

Hi,

I see the following line in tree conflicts notes "detection.txt":

"We skip tree conflict detection if the record_only field of the
merge-command baton is FALSE. A record-only merge operation updates
mergeinfo without touching files."

On the other hand, in docstring for svn_client_merge3 in
subversion/include/svn_client.h we have:

"* If @a record_only is TRUE, the merge isn't actually performed, but
  * the mergeinfo for the revisions which would've been merged is
  * recorded in the working copy (and must be subsequently committed
  * back to the repository)."

Which is confusing. From the above I think detection.txt should state,

"We skip tree conflict detection if the record_only field of the
merge-command baton is TRUE. A record-only merge operation updates
mergeinfo without touching files."

The attached patch fixes the above in tree conflicts detection.txt.

[[[
* notes/tree-conflicts/detection.txt
   (): Clairfy doc for record_only merges.

Patch by: stylesen
]]]

Thank You.

-- 
Senthil Kumaran S
http://www.stylesen.org/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org