[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[PATCH] #3493 svn patch skips missing directories

From: Daniel Näslund <daniel_at_longitudo.com>
Date: Mon, 11 Jan 2010 20:42:33 +0100

Hi!

[[[
Fix #3493 - svn patch skips missing dirs.

* subversion/libsvn_client/patch.c
  (svn_client_patch): Replace the last adm_access calls. Needed to be
    able to use the write-locks in svn_client__make_local_parents().
  (apply_textdiffs, apply_one_patch): Change ctx parameter to be non
    const.
  (apply_one_patch): Create intermediate missing dirs.
  (resolve_target_path): Don't mark the target to be skipped if there is
    no containing dir. Walk the tree to the wc-root checking if one of
    the dirs above our target is scheduled for deletion.

* subversion/tests/cmdline/patch_tests.py
  (patch_add_new_dir): New. Tests for adding files with missing dirs and
    the case where one of the dirs above is scheduled for deletion.

Patch by: Daniel Näslund <daniel{_AT_}longitudo.com>
]]]

Right now the code does not skip when one of the dirs in the patch
file is a wc file. But I'm not sure that it's needed.

Daniel

Received on 2010-01-11 20:43:15 CET

This is an archived mail posted to the Subversion Dev mailing list.