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

Re: [PATCH] Moving/copying added files and dirs

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-08-08 20:52:10 CEST

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

> ...and here here it is. This patch supports copying and moving of added
> paths within a WC or from a WC to the REPOS.
> Re issue 1 above, after looking at this I think the solution shouldn't
> reside in libsvn_wc, but rather in libsvn_client. Trying to teach
> svn_wc_copy2() to copy paths that are not versioned doesn't make a lot of
> sense. It seems all we really need to do is copy the added files without
> the administrative directories and then add them. The first task sounds
> an awful lot like an export, and with some borrowed/modified code from
> copy_versioned_files() in export.c that's what this patch does. Then a
> call to svn_client_add3() adds the copied files. Does this approach sound
> reasonable?

Works for me.

> Also, there is one obvious oddity regarding my solution, that is the
> notification of 'A'dded 'D'eleted paths. Normally svn copy reports 'A'dds
> first then 'D'eletes, but this patch reports in the opposite order when
> moving/copying an added path (i.e. the Deletes are reported first). It's
> certainly possible to make tweak wc_to_wc_copy() to make the ordering the
> same, but it would require a bit more cumbersome logic and require
> svn_wc_adm_access_t *adm_access/src_access to be opened and closed twice,
> and I wasn't sure this is worth it(?).
> Let me know your thoughts,

The patch seems reasonable, but I'm getting some test failures,
specifically the new tests are failing because the order of the lines
in the output isn't matching up. Perhaps we're relying on the order
of a hash someplace?

Anyway, other than that the change itself looks great.


To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Aug 8 20:52:44 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.