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

question about interaction between merge and sparse working copies

From: Jeff Yemin <jeff.yemin_at_gmail.com>
Date: Tue, 21 Oct 2008 07:30:35 -0700 (PDT)

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

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
$ svn diff

Property changes on: .
Added: svn:mergeinfo
   Merged /modules/mymodule/trunk:r34079*

Property changes on: src
Added: svn:mergeinfo
   Merged /modules/mymodule/trunk/src:r34079*


Property changes on: src/sites
Modified: svn:mergeinfo
   Reverse-merged /modules/mymodule/trunk/src/sites:r34034
   Merged /modules/mymodule/trunk/src/sites:r34079

The file that was actually changed in revision 34079 shows no differences.
The svn copy that created the branch was done in revision 34049, so the
reverse merge of revision 34034 is strange.

When I run the same operations on a non-sparse working copy, the merge works
as expected:

$ svn merge -c 34079 https://myserver.com/modules/mymodule/trunk
--- Merging r34079 into '.':
U src/sites/test.com/main/config/stage/dev/Initial.properties

$ svn diff

Property changes on: .
Added: svn:mergeinfo
   Merged /modules/mymodule/trunk:r34079

Index: src/sites/test.com/main/config/stage/dev/Initial.properties
--- src/sites/test.com/main/config/stage/dev/Initial.properties (revision
+++ src/sites/test.com/main/config/stage/dev/Initial.properties (working
@@ -1 +1,2 @@
-# test file
+# test file
+# first change

Any help would be appreciated.


View this message in context: http://www.nabble.com/question-about-interaction-between-merge-and-sparse-working-copies-tp20091531p20091531.html
Sent from the Subversion Users mailing list archive at Nabble.com.
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:31:03 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.