← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/tests/libsvn_wc/conflict-data-test.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/tests/libsvn_wc/conflict-data-test.c
740
740
  svn_error_t *err;
741
741
  const char *lock_abspath;
742
742
  test_prop_conflict_baton_t *b = apr_pcalloc(pool, sizeof(*b));
743
 
  svn_wc_conflict_description2_t *desc = apr_pcalloc(pool, sizeof(*b));
 
743
  svn_wc_conflict_description2_t *desc = apr_pcalloc(pool, sizeof(*desc));
744
744
 
745
745
  SVN_ERR(svn_test__sandbox_create(&sbox, "test_prop_conflicts", opts, pool));
746
746