Checkout
kfogel
committed
on 03 Nov 08
On the issue-2843-dev branch: resolve conflicts from the r34009 merge.

* subversion/libsvn_wc/update_editor.c
(do_entry_deletion): Adjust… Show more
On the issue-2843-dev branch: resolve conflicts from the r34009 merge.

* subversion/libsvn_wc/update_editor.c

 (do_entry_deletion): Adjust for check_tree_conflict's new parameters.

* subversion/libsvn_wc/lock.c

 (do_open): Adjust for r33676.

* subversion/libsvn_client/ra.c

 (svn_client_uuid_from_path): Adjust for r33775.

* subversion/libsvn_wc/adm_crawler.c

 (svn_wc_crawl_revisions4): Resolve non-conflict.

Show less