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

Including local changes in one WC in merge to another

From: Brian Buesker <bbuesker_at_qualcomm.com>
Date: 2005-06-02 19:44:12 CEST

I'm trying to merge changes that have been made in one working copy
since a specific revision (including any local changes that have not
been committed) to a new working copy using the perl bindings. From
reading the documentation for the perl bindings, it was my understanding
that I should be able to specify 'WORKING' as the second revision for
the merge. In other words, something like:

use SVN::Client;

my $client = new SVN::Client;

$client->merge ('/var/tmp/trunk', 1, '/var/tmp/trunk', 'WORKING',
                '/var/tmp/trunk-other', 1, 1, 1, 0);

However, that does not result in anything being merged. If instead I
commit the first working copy, and then specify 'HEAD' as the second
revision for the merge, the changes are merged into the second working
copy.

Is 'WORKING' as a revision not valid for a merge? If it is not valid, is
there some way I can do this merge without doing the commit first, or
will I always need to do the commit?

I'm using SVN version 1.1.4.

Thanks,
Brian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 2 19:49:26 2005

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