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

Re: [PATCH] Multiple WC copies/moves without intervening ci

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-18 20:37:10 CEST

On 7/17/06, Paul Burba <paulb@softlanding.com> wrote:

> [[[
> Support copy/move of files/dirs that are already copied/moved but not
> committed.
>
> Patch by: zhakov
> rooneg
> me
>
> * subversion/libsvn_wc/copy.c:
> (get_copyfrom_url_rev_via_parent): New helper function for
> copy_file_administratively and copy_dir_administratively.
> (copy_file_administratively, copy_dir_administratively): Use
> source's copyfrom-url and copyfrom-rev instead of url and rev
> when copying or moving already copied/moved files or directories.
> If source does not have copyfrom info, call then the new helper
> function to climb up source's parent directory and build the
> copyfrom info.
> (Rabbinic Commentary): Removed.
>
> * subversion/tests/cmdline/copy_tests.py
> (copy_copied_file_and_dir, move_copied_file_and_dir,
> move_moved_file_and_dir, move_file_within_moved_dir,
> move_file_out_of_moved_dir, move_dir_within_moved_dir,
> move_dir_out_of_moved_dir, move_file_back_and_forth,
> move_dir_back_and_forth): New tests.
> (test_list): Run new tests.
> ]]]

In general this stuff looks good, just a few little tweaks. First,
there were some warnings in the copy code because
get_copyfrom_url_rev_via_parent takes a const char **, but the
copyfrom_url variable is non-const. I made it const, and that gave us
problems because svn_wc_get_ancestry expects a non-const pointer, so I
used a temp variable for that...

Also, test 45 in copy_tests.py had a spurious raise svntest.Failure,
removed that and the tests passed fine.

Here's an updated patch.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Tue Jul 18 20:37:53 2006

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