← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to subversion/libsvn_client/resolved.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2006-12-13 17:57:16 UTC
  • mfrom: (1.1.6 upstream) (0.1.3 etch)
  • Revision ID: james.westby@ubuntu.com-20061213175716-2ysv6z4w5dpa2r2f
Tags: 1.4.2dfsg1-2ubuntu1
* Merge with Debian unstable; remaining changes:
  - Create pot file on build.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_client/resolved.c
32
32
/*** Code. ***/
33
33
 
34
34
svn_error_t *
35
 
svn_client_resolved (const char *path,
36
 
                     svn_boolean_t recursive,
37
 
                     svn_client_ctx_t *ctx,
38
 
                     apr_pool_t *pool)
 
35
svn_client_resolved(const char *path,
 
36
                    svn_boolean_t recursive,
 
37
                    svn_client_ctx_t *ctx,
 
38
                    apr_pool_t *pool)
39
39
{
40
40
  svn_wc_adm_access_t *adm_access;
41
41
 
42
 
  SVN_ERR (svn_wc_adm_probe_open3 (&adm_access, NULL, path, TRUE,
43
 
                                   recursive ? -1 : 0,
44
 
                                   ctx->cancel_func, ctx->cancel_baton,
45
 
                                   pool));
46
 
 
47
 
  SVN_ERR (svn_wc_resolved_conflict2 (path, adm_access, TRUE, TRUE, recursive,
48
 
                                      ctx->notify_func2, ctx->notify_baton2,
49
 
                                      ctx->cancel_func, ctx->cancel_baton,
50
 
                                      pool));
51
 
 
52
 
  SVN_ERR (svn_wc_adm_close (adm_access));
 
42
  SVN_ERR(svn_wc_adm_probe_open3(&adm_access, NULL, path, TRUE,
 
43
                                 recursive ? -1 : 0,
 
44
                                 ctx->cancel_func, ctx->cancel_baton,
 
45
                                 pool));
 
46
 
 
47
  SVN_ERR(svn_wc_resolved_conflict2(path, adm_access, TRUE, TRUE, recursive,
 
48
                                    ctx->notify_func2, ctx->notify_baton2,
 
49
                                    ctx->cancel_func, ctx->cancel_baton,
 
50
                                    pool));
 
51
 
 
52
  SVN_ERR(svn_wc_adm_close(adm_access));
53
53
 
54
54
  return SVN_NO_ERROR;
55
55
}