← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_fs_base/bdb/reps-table.c

  • Committer: Package Import Robot
  • Author(s): James McCoy, Peter Samuelson, James McCoy
  • Date: 2014-01-12 19:48:33 UTC
  • mfrom: (0.2.10)
  • Revision ID: package-import@ubuntu.com-20140112194833-w3axfwksn296jn5x
Tags: 1.8.5-1
http://bugs.debian.org/725787
http://bugs.debian.org/507430
http://bugs.debian.org/734163
http://bugs.debian.org/601544
http://bugs.debian.org/687291
http://bugs.debian.org/273874
http://bugs.debian.org/690815
http://bugs.debian.org/654172
http://bugs.debian.org/678224
http://bugs.debian.org/566148
http://bugs.debian.org/734918
http://bugs.debian.org/722393
[ Peter Samuelson ]
* New upstream release.  (Closes: #725787) Rediff patches:
  - Remove apr-abi1 (applied upstream), rename apr-abi2 to apr-abi
  - Remove loosen-sqlite-version-check (shouldn't be needed)
  - Remove java-osgi-metadata (applied upstream)
  - svnmucc prompts for a changelog if none is provided. (Closes: #507430)
  - Remove fix-bdb-version-detection, upstream uses "apu-config --dbm-libs"
  - Remove ruby-test-wc (applied upstream)
  - Fix “svn diff -r N file” when file has svn:mime-type set.
    (Closes: #734163)
  - Support specifying an encoding for mod_dav_svn's environment in which
    hooks are run.  (Closes: #601544)
  - Fix ordering of “svnadmin dump” paths with certain APR versions.
    (Closes: #687291)
  - Provide a better error message when authentication fails with an
    svn+ssh:// URL.  (Closes: #273874)
  - Updated Polish translations.  (Closes: #690815)

[ James McCoy ]
* Remove all traces of libneon, replaced by libserf.
* patches/sqlite_3.8.x_workaround: Upstream fix for wc-queries-test test
  failurse.
* Run configure with --with-apache-libexecdir, which allows removing part of
  patches/rpath.
* Re-enable auth-test as upstream has fixed the problem of picking up
  libraries from the environment rather than the build tree.
  (Closes: #654172)
* Point LD_LIBRARY_PATH at the built auth libraries when running the svn
  command during the build.  (Closes: #678224)
* Add a NEWS entry describing how to configure mod_dav_svn to understand
  UTF-8.  (Closes: #566148)
* Remove ancient transitional package, libsvn-ruby.
* Enable compatibility with Sqlite3 versions back to Wheezy.
* Enable hardening flags.  (Closes: #734918)
* patches/build-fixes: Enable verbose build logs.
* Build against the default ruby version.  (Closes: #722393)

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_fs_base/bdb/reps-table.c
98
98
       _("No such representation '%s'"), key);
99
99
 
100
100
  /* Handle any other error conditions.  */
101
 
  SVN_ERR(BDB_WRAP(fs, _("reading representation"), db_err));
 
101
  SVN_ERR(BDB_WRAP(fs, N_("reading representation"), db_err));
102
102
 
103
103
  /* Parse the REPRESENTATION skel.  */
104
104
  skel = svn_skel__parse(result.data, result.size, pool);
125
125
 
126
126
  /* Now write the record. */
127
127
  svn_fs_base__trail_debug(trail, "representations", "put");
128
 
  return BDB_WRAP(fs, _("storing representation"),
 
128
  return BDB_WRAP(fs, N_("storing representation"),
129
129
                  bfd->representations->put
130
130
                  (bfd->representations, trail->db_txn,
131
131
                   svn_fs_base__str_to_dbt(&query, key),
153
153
  /* Get the current value associated with `next-key'.  */
154
154
  svn_fs_base__str_to_dbt(&query, NEXT_KEY_KEY);
155
155
  svn_fs_base__trail_debug(trail, "representations", "get");
156
 
  SVN_ERR(BDB_WRAP(fs, _("allocating new representation (getting next-key)"),
 
156
  SVN_ERR(BDB_WRAP(fs, N_("allocating new representation (getting next-key)"),
157
157
                   bfd->representations->get
158
158
                   (bfd->representations, trail->db_txn, &query,
159
159
                    svn_fs_base__result_dbt(&result), 0)));
174
174
     svn_fs_base__str_to_dbt(&result, next_key),
175
175
     0);
176
176
 
177
 
  return BDB_WRAP(fs, _("bumping next representation key"), db_err);
 
177
  return BDB_WRAP(fs, N_("bumping next representation key"), db_err);
178
178
}
179
179
 
180
180
 
200
200
       _("No such representation '%s'"), key);
201
201
 
202
202
  /* Handle any other error conditions.  */
203
 
  return BDB_WRAP(fs, _("deleting representation"), db_err);
 
203
  return BDB_WRAP(fs, N_("deleting representation"), db_err);
204
204
}