Stefan Paletta:

rediff svn_sm.patch for subversion 1.0.0


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2436 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

package/rene/subversion/svn_sm.patch

@@ -1,5 +1,6 @@
---- subversion-0.35.0/subversion/clients/cmdline/cl.h	2003-12-11 01:01:45.000000000 +0100
-+++ subversion-0.35.0_my/subversion/clients/cmdline/cl.h	2004-01-09 02:26:55.000000000 +0100
+diff -ur subversion-1.0.0/subversion/clients/cmdline/cl.h subversion-1.0.0_sm/subversion/clients/cmdline/cl.h
+--- subversion-1.0.0/subversion/clients/cmdline/cl.h	2004-01-21 03:48:39.000000000 +0100
++++ subversion-1.0.0_sm/subversion/clients/cmdline/cl.h	2004-02-26 21:56:45.163096472 +0100
 @@ -51,6 +51,7 @@
    svn_cl__config_dir_opt,
    svn_cl__diff_cmd_opt,
@@ -8,16 +9,17 @@
    svn_cl__editor_cmd_opt,
    svn_cl__encoding_opt,
    svn_cl__force_log_opt,
-@@ -117,6 +118,7 @@
-   svn_boolean_t notice_ancestry; /* notice ancestry for diff-y operations */
+@@ -119,6 +120,7 @@
+   svn_boolean_t ignore_ancestry; /* ignore ancestry for merge-y operations */
    svn_boolean_t stop_on_copy;    /* don't cross copies during processing */
    svn_boolean_t dry_run;         /* try operation but make no changes */
 +  svn_boolean_t duplicate;       /* simply duplicate copied files and dirs */
    svn_boolean_t revprop;         /* operate on a revision property */
    const char *diff_cmd;          /* the external diff command to use */
    const char *merge_cmd;         /* the external merge command to use */
---- subversion-0.35.0/subversion/clients/cmdline/main.c	2003-12-02 23:52:31.000000000 +0100
-+++ subversion-0.35.0_my/subversion/clients/cmdline/main.c	2004-01-09 02:29:58.000000000 +0100
+diff -ur subversion-1.0.0/subversion/clients/cmdline/main.c subversion-1.0.0_sm/subversion/clients/cmdline/main.c
+--- subversion-1.0.0/subversion/clients/cmdline/main.c	2004-02-19 03:49:12.000000000 +0100
++++ subversion-1.0.0_sm/subversion/clients/cmdline/main.c	2004-02-26 21:58:47.786454888 +0100
 @@ -103,6 +103,8 @@
                        "do no interactive prompting"},
      {"dry-run",       svn_cl__dry_run_opt, 0,
@@ -27,16 +29,16 @@
      {"no-diff-deleted", svn_cl__no_diff_deleted, 0,
                         "do not print differences for deleted files"},
      {"notice-ancestry", svn_cl__notice_ancestry_opt, 0,
-@@ -367,7 +369,7 @@
+@@ -369,7 +371,7 @@
      "  the sources have identical basenames that match a file within '.':\n"
      "  in which case, the differences will be applied to that file.\n",
      {'r', 'N', 'q', svn_cl__force_opt, svn_cl__dry_run_opt,
--     svn_cl__merge_cmd_opt, svn_cl__notice_ancestry_opt, 
-+     svn_cl__duplicate_opt, svn_cl__merge_cmd_opt, svn_cl__notice_ancestry_opt, 
+-     svn_cl__merge_cmd_opt, svn_cl__ignore_ancestry_opt, 
++     svn_cl__duplicate_opt, svn_cl__merge_cmd_opt, svn_cl__ignore_ancestry_opt, 
       SVN_CL__AUTH_OPTIONS, svn_cl__config_dir_opt} },
    
    { "mkdir", svn_cl__mkdir, {0},
-@@ -826,6 +828,9 @@
+@@ -833,6 +835,9 @@
        case svn_cl__dry_run_opt:
          opt_state.dry_run = TRUE;
          break;
@@ -46,19 +48,21 @@
        case svn_cl__revprop_opt:
          opt_state.revprop = TRUE;
          break;
---- subversion-0.35.0/subversion/clients/cmdline/merge-cmd.c	2003-12-07 19:53:31.000000000 +0100
-+++ subversion-0.35.0_my/subversion/clients/cmdline/merge-cmd.c	2004-01-09 02:25:24.000000000 +0100
+diff -ur subversion-1.0.0/subversion/clients/cmdline/merge-cmd.c subversion-1.0.0_sm/subversion/clients/cmdline/merge-cmd.c
+--- subversion-1.0.0/subversion/clients/cmdline/merge-cmd.c	2004-01-21 03:48:39.000000000 +0100
++++ subversion-1.0.0_sm/subversion/clients/cmdline/merge-cmd.c	2004-02-26 21:56:45.165096168 +0100
 @@ -165,6 +165,7 @@
-                           opt_state->notice_ancestry ? FALSE : TRUE,
+                           opt_state->ignore_ancestry,
                            opt_state->force,
                            opt_state->dry_run,
 +                          opt_state->duplicate,
                            ctx,
                            pool); 
    if (err)
---- subversion-0.35.0/subversion/include/svn_client.h	2003-12-05 23:33:54.000000000 +0100
-+++ subversion-0.35.0_my/subversion/include/svn_client.h	2004-01-09 02:24:40.000000000 +0100
-@@ -871,6 +871,7 @@
+diff -ur subversion-1.0.0/subversion/include/svn_client.h subversion-1.0.0_sm/subversion/include/svn_client.h
+--- subversion-1.0.0/subversion/include/svn_client.h	2004-01-24 18:06:20.000000000 +0100
++++ subversion-1.0.0_sm/subversion/include/svn_client.h	2004-02-26 21:56:45.166096016 +0100
+@@ -848,6 +848,7 @@
                    svn_boolean_t ignore_ancestry,
                    svn_boolean_t force,
                    svn_boolean_t dry_run,
@@ -66,9 +70,10 @@
                    svn_client_ctx_t *ctx,
                    apr_pool_t *pool);
  
---- subversion-0.35.0/subversion/libsvn_client/diff.c	2003-12-12 13:29:54.000000000 +0100
-+++ subversion-0.35.0_my/subversion/libsvn_client/diff.c	2004-01-10 12:34:25.000000000 +0100
-@@ -601,6 +601,7 @@
+diff -ur subversion-1.0.0/subversion/libsvn_client/diff.c subversion-1.0.0_sm/subversion/libsvn_client/diff.c
+--- subversion-1.0.0/subversion/libsvn_client/diff.c	2004-01-24 17:52:15.000000000 +0100
++++ subversion-1.0.0_sm/subversion/libsvn_client/diff.c	2004-02-26 21:56:45.169095560 +0100
+@@ -622,6 +622,7 @@
  struct merge_cmd_baton {
    svn_boolean_t force;
    svn_boolean_t dry_run;
@@ -76,7 +81,7 @@
    const char *target;                 /* Working copy target of merge */
    const char *url;                    /* The second URL in the merge */
    const char *path;                   /* The wc path of the second target, this
-@@ -751,7 +752,7 @@
+@@ -772,7 +773,7 @@
    struct merge_cmd_baton *merge_b = baton;
    apr_pool_t *subpool = svn_pool_create (merge_b->pool);
    svn_node_kind_t kind;
@@ -85,7 +90,7 @@
    const char *child;
  
    /* Easy out:  if we have no adm_access for the parent directory,
-@@ -783,8 +784,10 @@
+@@ -804,8 +805,10 @@
            {
              child = svn_path_is_child(merge_b->target, mine, merge_b->pool);
              assert (child != NULL);
@@ -98,7 +103,7 @@
  
              /* Since 'mine' doesn't exist, and this is
                 'merge_file_added', I hope it's safe to assume that
-@@ -930,7 +933,8 @@
+@@ -951,7 +954,8 @@
    apr_pool_t *subpool = svn_pool_create (merge_b->pool);
    svn_node_kind_t kind;
    const svn_wc_entry_t *entry;
@@ -108,7 +113,7 @@
  
    /* Easy out:  if we have no adm_access for the parent directory,
       then this portion of the tree-delta "patch" must be inapplicable.
-@@ -945,8 +949,10 @@
+@@ -966,8 +970,10 @@
  
    child = svn_path_is_child (merge_b->target, path, subpool);
    assert (child != NULL);
@@ -121,7 +126,7 @@
  
    SVN_ERR (svn_io_check_path (path, &kind, subpool));
    switch (kind)
-@@ -1945,6 +1951,7 @@
+@@ -1967,6 +1973,7 @@
                    svn_boolean_t ignore_ancestry,
                    svn_boolean_t force,
                    svn_boolean_t dry_run,
@@ -129,7 +134,7 @@
                    svn_client_ctx_t *ctx,
                    apr_pool_t *pool)
  {
-@@ -1992,6 +1999,7 @@
+@@ -2014,6 +2021,7 @@
  
    merge_cmd_baton.force = force;
    merge_cmd_baton.dry_run = dry_run;