Resolve conflicts from merge, as promised in r23009. Branch builds again.
git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/incomplete-directories@863084 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/subversion/include/svn_wc.h b/subversion/include/svn_wc.h
index e3fd5e5..77fa3c2 100644
--- a/subversion/include/svn_wc.h
+++ b/subversion/include/svn_wc.h
@@ -1325,22 +1325,6 @@
*/
const char *changelist;
-<<<<<<< .working
- /** The depth of this entry.
- *
- * ### It's a bit annoying that we only use this on this_dir
- * ### entries, yet it will exist (with value svn_depth_infinity) on
- * ### all entries. Maybe some future extensibility would make this
- * ### field meaningful on entries besides this_dir.
- *
- * @since New in 1.5.
- */
- svn_depth_t depth;
-
- /* IMPORTANT: If you extend this structure, check svn_wc_entry_dup()
- and alloc_entry() in libsvn_wc/entries.c, to see if you need to
- extend one or both of them as well. */
-=======
/** Whether a local copy of this entry should be kept in the working copy
* after a deletion has been committed, Only valid for the this-dir entry
* when it is scheduled for deletion.
@@ -1348,9 +1332,19 @@
* @since New in 1.5. */
svn_boolean_t keep_local;
- /* IMPORTANT: If you extend this structure, check svn_wc_entry_dup() to see
- if you need to extend that as well. */
->>>>>>> .merge-right.r23006
+ /** The depth of this entry.
+ *
+ * ### It's a bit annoying that we only use this on this_dir
+ * ### entries, yet it will exist (with value svn_depth_infinity) on
+ * ### all entries. Maybe some future extensibility would make this
+ * ### field meaningful on entries besides this_dir.
+ *
+ * @since New in 1.5. */
+ svn_depth_t depth;
+
+ /* IMPORTANT: If you extend this structure, check svn_wc_entry_dup()
+ and alloc_entry() in libsvn_wc/entries.c, to see if you need to
+ extend one or both of them as well. */
} svn_wc_entry_t;
diff --git a/subversion/libsvn_ra_local/ra_plugin.c b/subversion/libsvn_ra_local/ra_plugin.c
index 835f4ae..d4450c2 100644
--- a/subversion/libsvn_ra_local/ra_plugin.c
+++ b/subversion/libsvn_ra_local/ra_plugin.c
@@ -609,39 +609,21 @@
pool));
/* Build a reporter baton. */
-<<<<<<< .working
SVN_ERR(svn_repos_begin_report2(&rbaton,
revision,
sbaton->username,
- sbaton->repos,
+ sbaton->repos,
sbaton->fs_path->data,
- target,
+ target,
other_fs_path,
text_deltas,
depth,
ignore_ancestry,
- editor,
+ editor,
edit_baton,
NULL,
NULL,
pool));
-=======
- SVN_ERR(svn_repos_begin_report(&rbaton,
- revision,
- sbaton->username,
- sbaton->repos,
- sbaton->fs_path->data,
- target,
- other_fs_path,
- text_deltas,
- recurse,
- ignore_ancestry,
- editor,
- edit_baton,
- NULL,
- NULL,
- pool));
->>>>>>> .merge-right.r23006
/* Wrap the report baton given us by the repos layer with our own
reporter baton. */
diff --git a/subversion/libsvn_repos/reporter.c b/subversion/libsvn_repos/reporter.c
index 28d8eb8..403aaa3 100644
--- a/subversion/libsvn_repos/reporter.c
+++ b/subversion/libsvn_repos/reporter.c
@@ -839,17 +839,13 @@
/* There is no corresponding target entry, so delete. */
e_fullpath = svn_path_join(e_path, s_entry->name, subpool);
-<<<<<<< .working
- if (s_entry->kind != svn_node_dir)
-=======
SVN_ERR(svn_repos_deleted_rev(svn_fs_root_fs(b->t_root),
svn_path_join(t_path,
s_entry->name,
subpool),
s_rev, b->t_rev,
&deleted_rev, subpool));
- if (b->recurse || s_entry->kind != svn_node_dir)
->>>>>>> .merge-right.r23006
+ if (s_entry->kind != svn_node_dir)
SVN_ERR(b->editor->delete_entry(e_fullpath,
deleted_rev,
dir_baton, subpool));
diff --git a/subversion/libsvn_wc/README b/subversion/libsvn_wc/README
index 0557030..a86d46b 100644
--- a/subversion/libsvn_wc/README
+++ b/subversion/libsvn_wc/README
@@ -478,7 +478,11 @@
changelist:
Which changelist this entry is part of, or empty if none.
-<<<<<<< .working
+keep-local:
+ A boolean: true iff this entry should be kept after a scheduled
+ deletion is committed. This is only allowed on the this_dir entry,
+ and only when the schedule is 'delete'.
+
depth:
The entry depth of this directory. `0' means updates will not pull
in any files or subdirectories not already present. `1' means
@@ -488,13 +492,6 @@
entries and pulls new entries with depth infinity as well.
Default is infinite (`').
-=======
-keep-local:
- A boolean: true iff this entry should be kept after a scheduled
- deletion is committed. This is only allowed on the this_dir entry,
- and only when the schedule is 'delete'.
-
->>>>>>> .merge-right.r23006
The only fields allowed in an entry for a directory (other than the
this_dir entry) are name, absent, deleted, schedule, copied,
copyfrom-url, copyfrom-rev and kind. The other fields are only stored
diff --git a/subversion/libsvn_wc/entries.c b/subversion/libsvn_wc/entries.c
index 12aa0ff..62693f8 100644
--- a/subversion/libsvn_wc/entries.c
+++ b/subversion/libsvn_wc/entries.c
@@ -452,7 +452,10 @@
SVN_ERR(read_str(&entry->changelist, buf, end, pool));
MAYBE_DONE;
-<<<<<<< .working
+ /* Keep entry in working copy after deletion? */
+ SVN_ERR(read_bool(&entry->keep_local, SVN_WC__ENTRY_ATTR_KEEP_LOCAL,
+ buf, end));
+
/* Depth. */
{
const char *result;
@@ -466,12 +469,6 @@
entry->depth = svn_depth_infinity;
}
-=======
- /* Keep entry in working copy after deletion? */
- SVN_ERR(read_bool(&entry->keep_local, SVN_WC__ENTRY_ATTR_KEEP_LOCAL,
- buf, end));
-
->>>>>>> .merge-right.r23006
done:
*new_entry = entry;
return SVN_NO_ERROR;
@@ -1568,7 +1565,9 @@
/* Changelist. */
write_str(buf, entry->changelist, pool);
-<<<<<<< .working
+ /* Keep in working copy flag. */
+ write_bool(buf, SVN_WC__ENTRY_ATTR_KEEP_LOCAL, entry->keep_local);
+
/* Depth. */
{
const char *val;
@@ -1590,11 +1589,6 @@
write_val(buf, val, strlen(val));
}
-=======
- /* Keep in working copy flag. */
- write_bool(buf, SVN_WC__ENTRY_ATTR_KEEP_LOCAL, entry->keep_local);
-
->>>>>>> .merge-right.r23006
/* Remove redundant separators at the end of the entry. */
while (buf->len > 1 && buf->data[buf->len - 2] == '\n')
buf->len--;
diff --git a/subversion/svn/commit-cmd.c b/subversion/svn/commit-cmd.c
index af2d676..a5d6379 100644
--- a/subversion/svn/commit-cmd.c
+++ b/subversion/svn/commit-cmd.c
@@ -95,8 +95,7 @@
/* Commit. */
SVN_ERR(svn_cl__cleanup_log_msg
-<<<<<<< .working
- (ctx->log_msg_baton2,
+ (ctx->log_msg_baton3,
svn_client_commit4(&commit_info,
targets,
SVN_DEPTH_TO_RECURSE(opt_state->depth),
@@ -105,17 +104,6 @@
opt_state->changelist,
ctx,
pool)));
-=======
- (ctx->log_msg_baton3, svn_client_commit4(&commit_info,
- targets,
- opt_state->nonrecursive
- ? FALSE : TRUE,
- no_unlock,
- opt_state->keep_changelist,
- opt_state->changelist,
- ctx,
- pool)));
->>>>>>> .merge-right.r23006
if (commit_info && ! opt_state->quiet)
SVN_ERR(svn_cl__print_commit_info(commit_info, pool));
diff --git a/subversion/svn/import-cmd.c b/subversion/svn/import-cmd.c
index 3cfc0e0..1c00701 100644
--- a/subversion/svn/import-cmd.c
+++ b/subversion/svn/import-cmd.c
@@ -104,18 +104,13 @@
svn_cl__get_notifier(&ctx->notify_func2, &ctx->notify_baton2,
FALSE, FALSE, FALSE, pool);
-<<<<<<< .working
if (opt_state->depth == svn_depth_unknown)
opt_state->depth = svn_depth_infinity;
- SVN_ERR(svn_cl__make_log_msg_baton(&(ctx->log_msg_baton2), opt_state,
-=======
SVN_ERR(svn_cl__make_log_msg_baton(&(ctx->log_msg_baton3), opt_state,
->>>>>>> .merge-right.r23006
NULL, ctx->config, pool));
SVN_ERR(svn_cl__cleanup_log_msg
-<<<<<<< .working
- (ctx->log_msg_baton2,
+ (ctx->log_msg_baton3,
/* ### TODO: take a real depth? But I'm not sure how
### useful that would be for an import. I could see
### svn_depth_files being useful for import, but we
@@ -127,15 +122,6 @@
opt_state->no_ignore,
ctx,
pool)));
-=======
- (ctx->log_msg_baton3, svn_client_import2(&commit_info,
- path,
- url,
- opt_state->nonrecursive,
- opt_state->no_ignore,
- ctx,
- pool)));
->>>>>>> .merge-right.r23006
if (commit_info && ! opt_state->quiet)
SVN_ERR(svn_cl__print_commit_info(commit_info, pool));
