← Back to branch summary

~svn/ubuntu/oneiric/subversion/ppa

« back to all changes in this revision

Viewing changes to subversion/svn/merge-cmd.c

  • Committer: Max Bowsher
  • Date: 2011-01-05 22:59:03 UTC
  • mfrom: (1.5.4 upstream)
  • Revision ID: maxb@f2s.com-20110105225903-8g49kyyh5zyqh5iw
Merge new upstream 1.6.15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/svn/merge-cmd.c
265
265
  else
266
266
    options = NULL;
267
267
 
 
268
  /* More input validation. */
 
269
  if (opt_state->reintegrate)
 
270
    {
 
271
      if (opt_state->depth != svn_depth_unknown)
 
272
        return svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
 
273
                                _("--depth cannot be used with "
 
274
                                  "--reintegrate"));
 
275
 
 
276
      if (opt_state->force)
 
277
        return svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
 
278
                                _("--force cannot be used with "
 
279
                                  "--reintegrate"));
 
280
 
 
281
      if (two_sources_specified)
 
282
        return svn_error_create(SVN_ERR_CL_ARG_PARSING_ERROR, NULL,
 
283
                                _("--reintegrate can only be used with "
 
284
                                  "a single merge source"));
 
285
    }
 
286
 
268
287
  if (! two_sources_specified) /* TODO: Switch order of if */
269
288
    {
270
289
      /* If we don't have a source, use the target as the source. */
286
305
        }
287
306
 
288
307
      if (opt_state->reintegrate)
289
 
        {
290
 
          if (opt_state->depth != svn_depth_unknown)
291
 
            return svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
292
 
                                    _("--depth cannot be used with "
293
 
                                      "--reintegrate"));
294
 
 
295
 
          if (opt_state->force)
296
 
            return svn_error_create(SVN_ERR_CL_MUTUALLY_EXCLUSIVE_ARGS, NULL,
297
 
                                    _("--force cannot be used with "
298
 
                                      "--reintegrate"));
299
 
 
300
 
          err = svn_client_merge_reintegrate(sourcepath1,
301
 
                                             &peg_revision1,
302
 
                                             targetpath,
303
 
                                             opt_state->dry_run,
304
 
                                             options, ctx, pool);
305
 
        }
 
308
        err = svn_client_merge_reintegrate(sourcepath1,
 
309
                                           &peg_revision1,
 
310
                                           targetpath,
 
311
                                           opt_state->dry_run,
 
312
                                           options, ctx, pool);
306
313
      else
307
314
        err = svn_client_merge_peg3(sourcepath1,
308
315
                                    ranges_to_merge,