← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_client/prop_commands.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_client/prop_commands.c
890
890
          const char *copy_root_abspath;
891
891
          svn_boolean_t is_copy;
892
892
 
893
 
          SVN_ERR(svn_dirent_get_absolute(&local_abspath, target,
894
 
                                          scratch_pool));
 
893
          /* Avoid assertion on the next line when somebody accidentally asks for
 
894
             a working copy revision on a URL */
 
895
          if (svn_path_is_url(target))
 
896
            return svn_error_create(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED,
 
897
                                    NULL, NULL);
 
898
 
 
899
          SVN_ERR_ASSERT(svn_dirent_is_absolute(target));
 
900
          local_abspath = target;
895
901
 
896
902
          if (SVN_CLIENT__REVKIND_NEEDS_WC(peg_revision->kind))
897
903
            {
1232
1238
         Report iprops anyway */
1233
1239
 
1234
1240
      SVN_ERR(b->wrapped_receiver(b->wrapped_receiver_baton,
1235
 
                                  b->anchor ? b->anchor : local_abspath,
 
1241
                                  b->anchor ? b->anchor : b->anchor_abspath,
1236
1242
                                  NULL /* prop_hash */,
1237
1243
                                  b->iprops,
1238
1244
                                  scratch_pool));
1293
1299
      const char *copy_root_abspath;
1294
1300
      svn_boolean_t is_copy;
1295
1301
 
 
1302
      /* Avoid assertion on the next line when somebody accidentally asks for
 
1303
         a working copy revision on a URL */
 
1304
      if (svn_path_is_url(path_or_url))
 
1305
        return svn_error_create(SVN_ERR_CLIENT_VERSIONED_PATH_REQUIRED,
 
1306
                                NULL, NULL);
 
1307
 
1296
1308
      SVN_ERR(svn_dirent_get_absolute(&local_abspath, path_or_url,
1297
1309
                                      scratch_pool));
1298
1310