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

Re: question about interaction between merge and sparse working copies

From: Mark Phippard <markphip_at_gmail.com>
Date: Tue, 21 Oct 2008 10:51:05 -0400

On Tue, Oct 21, 2008 at 10:30 AM, Jeff Yemin <jeff.yemin_at_gmail.com> wrote:
> I'm doing some testing of the interaction between sparse working copies and
> svn merge, and the results seem like a bug, but I wanted to check on the
> list first.
> I have a rather large project whose structure would benefit greatly from a
> sparse working copy. I branched the trunk of this project, and created a
> sparse working copy of the branch. Next, I made a change on the trunk to a
> file that is part of the sparse working copy. I then ran the mergeinfo
> command on the working copy of the branch, and it detected that this change
> could be applied to the working copy:
> $ svn mergeinfo https://myserver.com/modules/mymodule/trunk --show-revs
> eligible
> r34079
> Next I did a dry run of the merge, but there was no output. I found this
> peculiar so I did the merge for real and ran svn diff to see if it actually
> did anything, and I got output like this:
> $ svn merge -c 34079 https://myserver.com/modules/mymodule/trunk

Try adding --depth=infinite to the merge command. I believe in your
example it would use the same depth as the current folder.

Mark Phippard
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-21 16:51:44 CEST

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

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