← Back to branch summary

~ubuntu-branches/debian/sid/subversion/sid

« back to all changes in this revision

Viewing changes to subversion/libsvn_ra_serf/update.c

  • Committer: Package Import Robot
  • Author(s): James McCoy
  • Date: 2014-05-20 22:45:32 UTC
  • mfrom: (0.2.12)
  • Revision ID: package-import@ubuntu.com-20140520224532-4fec3gohdzyy692g
Tags: 1.8.9-1
* New upstream release
* Merge changes from Ubuntu:
  - Add DEB-8 test for Apache functionality
  - debian/rules: Create pot file on build.
  - debian/rules: Ensure the doxygen output directory exists
  - Move svn2cl to subversion-tools' Suggests on Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_ra_serf/update.c
329
329
     files/dirs? */
330
330
  svn_boolean_t add_props_included;
331
331
 
332
 
  /* Path -> lock token mapping. */
333
 
  apr_hash_t *lock_path_tokens;
334
 
 
335
332
  /* Path -> const char *repos_relpath mapping */
336
333
  apr_hash_t *switched_paths;
337
334
 
2248
2245
                                        info->pool);
2249
2246
        }
2250
2247
 
2251
 
      info->lock_token = svn_hash_gets(ctx->lock_path_tokens, info->name);
2252
 
 
2253
2248
      if (info->lock_token && !info->fetch_props)
2254
2249
        info->fetch_props = TRUE;
2255
2250
 
2578
2573
  SVN_ERR(svn_io_file_write_full(report->body_file, buf->data, buf->len,
2579
2574
                                 NULL, pool));
2580
2575
 
2581
 
  if (lock_token)
2582
 
    {
2583
 
      svn_hash_sets(report->lock_path_tokens,
2584
 
                    apr_pstrdup(report->pool, path),
2585
 
                    apr_pstrdup(report->pool, lock_token));
2586
 
    }
2587
 
 
2588
2576
  return SVN_NO_ERROR;
2589
2577
}
2590
2578
 
2660
2648
  if (!*path)
2661
2649
    report->root_is_switched = TRUE;
2662
2650
 
2663
 
  if (lock_token)
2664
 
    {
2665
 
      svn_hash_sets(report->lock_path_tokens,
2666
 
                    path, apr_pstrdup(report->pool, lock_token));
2667
 
    }
2668
 
 
2669
2651
  return APR_SUCCESS;
2670
2652
}
2671
2653
 
3193
3175
  report->ignore_ancestry = ignore_ancestry;
3194
3176
  report->send_copyfrom_args = send_copyfrom_args;
3195
3177
  report->text_deltas = text_deltas;
3196
 
  report->lock_path_tokens = apr_hash_make(report->pool);
3197
3178
  report->switched_paths = apr_hash_make(report->pool);
3198
3179
 
3199
3180
  report->source = src_path;