← Back to branch summary

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

« back to all changes in this revision

Viewing changes to subversion/libsvn_wc/wc_db_wcroot.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_wc/wc_db_wcroot.c
690
690
          svn_error_clear(err);
691
691
          *wcroot = NULL;
692
692
        }
693
 
      else
694
 
        SVN_ERR(err);
 
693
      else if (err)
 
694
        {
 
695
          /* Close handle if we are not going to use it to support
 
696
             upgrading with exclusive wc locking. */
 
697
          return svn_error_compose_create(err, svn_sqlite__close(sdb));
 
698
        }
695
699
    }
696
700
  else
697
701
    {