You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2010/02/03 21:01:08 UTC
svn commit: r906210 - /subversion/trunk/subversion/libsvn_client/patch.c
Author: stsp
Date: Wed Feb 3 20:01:08 2010
New Revision: 906210
URL: http://svn.apache.org/viewvc?rev=906210&view=rev
Log:
* subversion/libsvn_client/patch.c
(patch_target_t): Remove the MODIFIED field. It serves no useful purpose.
(init_patch_target, send_patch_notification, apply_one_patch,
install_patched_target): Don't set/read the above removed field anymore.
When notifying about anything we haven't skipped, it was modified.
Modified:
subversion/trunk/subversion/libsvn_client/patch.c
Modified: subversion/trunk/subversion/libsvn_client/patch.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/patch.c?rev=906210&r1=906209&r2=906210&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/patch.c (original)
+++ subversion/trunk/subversion/libsvn_client/patch.c Wed Feb 3 20:01:08 2010
@@ -127,11 +127,6 @@
/* True if the target had to be skipped for some reason. */
svn_boolean_t skipped;
- /* True if at least one hunk was applied to the target.
- * The hunk may have been a no-op, however (e.g. a hunk trying
- * to delete a line from an empty file). */
- svn_boolean_t modified;
-
/* True if at least one hunk was rejected. */
svn_boolean_t had_rejects;
@@ -492,7 +487,6 @@
target->patch = patch;
target->current_line = 1;
- target->modified = FALSE;
target->had_rejects = FALSE;
target->deleted = FALSE;
target->eof = FALSE;
@@ -982,10 +976,8 @@
notify->content_state = svn_wc_notify_state_conflicted;
else if (target->local_mods)
notify->content_state = svn_wc_notify_state_merged;
- else if (target->modified)
- notify->content_state = svn_wc_notify_state_changed;
else
- notify->content_state = svn_wc_notify_state_unchanged;
+ notify->content_state = svn_wc_notify_state_changed;
}
(*ctx->notify_func2)(ctx->notify_baton2, notify, pool);
@@ -1102,9 +1094,7 @@
{
/* We could not copy the entire target file to the temporary file,
* and would truncate the target if we copied the temporary file
- * on top of it. Cancel any modifications to the target file and
- * report is as skipped. */
- target->modified = FALSE;
+ * on top of it. Skip this target. */
target->skipped = TRUE;
}
}
@@ -1179,8 +1169,6 @@
}
else
{
- target->modified = TRUE;
-
/* If the target's parent directory does not yet exist
* we need to create it before we can copy the patched
* result in place. */