You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2009/12/01 16:31:51 UTC
svn commit: r885796 - /subversion/trunk/subversion/libsvn_client/merge.c
Author: pburba
Date: Tue Dec 1 15:31:50 2009
New Revision: 885796
URL: http://svn.apache.org/viewvc?rev=885796&view=rev
Log:
Follow-up to r880264, be sure to set state and tree conflict output
parameters during --record-only merges.
Found by: philip
* subversion/libsvn_client/merge.c
(merge_file_changed,
merge_file_added,
merge_file_deleted,
merge_dir_added,
merge_dir_deleted):
Improve comments regarding early return during
--record-only merges. Set any svn_wc_notify_state_t * arguments to
svn_wc_notify_state_unchanged and any tree conflicted output argument to
false, if any of these are not already set.
Modified:
subversion/trunk/subversion/libsvn_client/merge.c
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=885796&r1=885795&r2=885796&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Dec 1 15:31:50 2009
@@ -1426,10 +1426,12 @@
if (prop_state)
*prop_state = svn_wc_notify_state_unchanged;
- /* Easy out: We are only applying mergeinfo changes to existing paths. */
+ /* Easy out: We are only applying mergeinfo differences. */
if (merge_b->record_only)
{
svn_pool_destroy(subpool);
+ if (content_state);
+ *content_state = svn_wc_notify_state_unchanged;
return SVN_NO_ERROR;
}
@@ -1556,10 +1558,16 @@
apr_hash_t *new_props;
const char *mine_abspath;
- /* Easy out: We are only applying mergeinfo changes to existing paths. */
+ /* Easy out: We are only applying mergeinfo differences. */
if (merge_b->record_only)
{
svn_pool_destroy(subpool);
+ if (content_state)
+ *content_state = svn_wc_notify_state_unchanged;
+ if (prop_state)
+ *prop_state = svn_wc_notify_state_unchanged;
+ if (tree_conflicted)
+ *tree_conflicted = FALSE;
return SVN_NO_ERROR;
}
@@ -1859,10 +1867,14 @@
svn_node_kind_t kind;
const char *mine_abspath;
- /* Easy out: We are only applying mergeinfo changes to existing paths. */
+ /* Easy out: We are only applying mergeinfo differences. */
if (merge_b->record_only)
{
svn_pool_destroy(subpool);
+ if (state)
+ *state = svn_wc_notify_state_unchanged;
+ if (tree_conflicted)
+ *tree_conflicted = FALSE;
return SVN_NO_ERROR;
}
@@ -2000,10 +2012,14 @@
svn_boolean_t is_deleted;
svn_error_t *err;
- /* Easy out: We are only applying mergeinfo changes to existing paths. */
+ /* Easy out: We are only applying mergeinfo differences. */
if (merge_b->record_only)
{
svn_pool_destroy(subpool);
+ if (state)
+ *state = svn_wc_notify_state_unchanged;
+ if (tree_conflicted)
+ *tree_conflicted = FALSE;
return SVN_NO_ERROR;
}
@@ -2213,10 +2229,14 @@
svn_boolean_t is_versioned;
svn_boolean_t is_deleted;
- /* Easy out: We are only applying mergeinfo changes to existing paths. */
+ /* Easy out: We are only applying mergeinfo differences. */
if (merge_b->record_only)
{
svn_pool_destroy(subpool);
+ if (state)
+ *state = svn_wc_notify_state_unchanged;
+ if (tree_conflicted)
+ *tree_conflicted = FALSE;
return SVN_NO_ERROR;
}
RE: svn commit: r885796 - /subversion/trunk/subversion/libsvn_client/merge.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: pburba@apache.org [mailto:pburba@apache.org]
> Sent: dinsdag 1 december 2009 16:32
> To: commits@subversion.apache.org
> Subject: svn commit: r885796 -
> /subversion/trunk/subversion/libsvn_client/merge.c
>
> Author: pburba
> Date: Tue Dec 1 15:31:50 2009
> New Revision: 885796
>
> URL: http://svn.apache.org/viewvc?rev=885796&view=rev
> Log:
> Follow-up to r880264, be sure to set state and tree conflict output
> parameters during --record-only merges.
>
> Found by: philip
>
> * subversion/libsvn_client/merge.c
> (merge_file_changed,
> merge_file_added,
> merge_file_deleted,
> merge_dir_added,
> merge_dir_deleted):
> Improve comments regarding early return during
> --record-only merges. Set any svn_wc_notify_state_t * arguments to
> svn_wc_notify_state_unchanged and any tree conflicted output argument
> to
> false, if any of these are not already set.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/merge.c
>
> Modified: subversion/trunk/subversion/libsvn_client/merge.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/
> merge.c?rev=885796&r1=885795&r2=885796&view=diff
> =======================================================================
> =======
> --- subversion/trunk/subversion/libsvn_client/merge.c (original)
> +++ subversion/trunk/subversion/libsvn_client/merge.c Tue Dec 1
> 15:31:50 2009
> @@ -1426,10 +1426,12 @@
> if (prop_state)
> *prop_state = svn_wc_notify_state_unchanged;
>
> - /* Easy out: We are only applying mergeinfo changes to existing
> paths. */
> + /* Easy out: We are only applying mergeinfo differences. */
> if (merge_b->record_only)
> {
> svn_pool_destroy(subpool);
> + if (content_state);
I don't think you want that ';' ^^^^ here.
Bert
> + *content_state = svn_wc_notify_state_unchanged;
> return SVN_NO_ERROR;
> }
>
RE: svn commit: r885796 - /subversion/trunk/subversion/libsvn_client/merge.c
Posted by Bert Huijben <be...@qqmail.nl>.
> -----Original Message-----
> From: pburba@apache.org [mailto:pburba@apache.org]
> Sent: dinsdag 1 december 2009 16:32
> To: commits@subversion.apache.org
> Subject: svn commit: r885796 -
> /subversion/trunk/subversion/libsvn_client/merge.c
>
> Author: pburba
> Date: Tue Dec 1 15:31:50 2009
> New Revision: 885796
>
> URL: http://svn.apache.org/viewvc?rev=885796&view=rev
> Log:
> Follow-up to r880264, be sure to set state and tree conflict output
> parameters during --record-only merges.
>
> Found by: philip
>
> * subversion/libsvn_client/merge.c
> (merge_file_changed,
> merge_file_added,
> merge_file_deleted,
> merge_dir_added,
> merge_dir_deleted):
> Improve comments regarding early return during
> --record-only merges. Set any svn_wc_notify_state_t * arguments to
> svn_wc_notify_state_unchanged and any tree conflicted output argument
> to
> false, if any of these are not already set.
>
> Modified:
> subversion/trunk/subversion/libsvn_client/merge.c
>
> Modified: subversion/trunk/subversion/libsvn_client/merge.c
> URL:
> http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/
> merge.c?rev=885796&r1=885795&r2=885796&view=diff
> =======================================================================
> =======
> --- subversion/trunk/subversion/libsvn_client/merge.c (original)
> +++ subversion/trunk/subversion/libsvn_client/merge.c Tue Dec 1
> 15:31:50 2009
> @@ -1426,10 +1426,12 @@
> if (prop_state)
> *prop_state = svn_wc_notify_state_unchanged;
>
> - /* Easy out: We are only applying mergeinfo changes to existing
> paths. */
> + /* Easy out: We are only applying mergeinfo differences. */
> if (merge_b->record_only)
> {
> svn_pool_destroy(subpool);
> + if (content_state);
I don't think you want that ';' ^^^^ here.
Bert
> + *content_state = svn_wc_notify_state_unchanged;
> return SVN_NO_ERROR;
> }
>