You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Senthil Kumaran S <se...@collab.net> on 2008/06/05 08:40:56 UTC
[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/
Re: [PATCH] Tree conflict detection doc clarification
Posted by Senthil Kumaran S <se...@collab.net>.
Kamesh Jayachandran wrote:
> +1 to commit it in trunk as trunk is the reference point of
> tree-conflict docs.
>
> Clairfy -> Clarify
Committed in r31598 (trunk) with above modification.
Thank You.
--
Senthil Kumaran S
http://www.stylesen.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Tree conflict detection doc clarification
Posted by Kamesh Jayachandran <ka...@collab.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
> This patch is against the tree conflicts branch.
>
> [[[
> On the tree conflicts branch,
>
> * notes/tree-conflicts/detection.txt
> (): Clairfy doc for record_only merges.
Good catch.
+1 to commit it in trunk as trunk is the reference point of
tree-conflict docs.
Clairfy -> Clarify
With regards
Kamesh Jayachandran
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQFIR7bh3WHvyO0YTCwRAmNdAKCcmULKVpehdd/bq+FoSHNB/yH8tgCcDWCS
SunWED739fNWUBzlkBhgPk0=
=Zi3/
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: [PATCH] Tree conflict detection doc clarification
Posted by Senthil Kumaran S <se...@collab.net>.
Senthil Kumaran S wrote:
> [[[
> * notes/tree-conflicts/detection.txt
> (): Clairfy doc for record_only merges.
>
> Patch by: stylesen
> ]]]
This patch is against the tree conflicts branch.
[[[
On the tree conflicts branch,
* notes/tree-conflicts/detection.txt
(): Clairfy doc for record_only merges.
Patch by: stylesen
]]]
--
Senthil Kumaran S
http://www.stylesen.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org