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

Trying to understand dry-run for merge

From: B Reed <binawmu_at_gmail.com>
Date: Fri, 21 Nov 2008 10:04:09 -0500

We are implementing SVN vendor strategy for our software that we
customize. This is our first time doing this and using SVN, so I am
trying to understand something that is confusing me. After doing our
first vendor patch we are ready to merge our customizations into to
the latest vendor code.
My questions are: Why does the dry run show deleting a directory and
then adding it? Also why does it show "Skipped" the subdirectories?
(See output below)

A bit of history about the directory: Both left and right have the
"task" directory in the latest revision, so I would think it would not
show anything. However I do see from the logs that when the tag
rel-1.0 was first created, it did not contain the "task" directory. We
then did a 'svn add task' and committed it to the tagged area. (We
needed to do this upon vendor recommendations - it is not a
customization so we wanted it in the tag for the vendor release.)

svn merge --dry-run https://my.svnserver/svn/app/tags/rel-1.0
https://my.svnserver/svn/app//tags/custom-1.0 .
D task
A task
Skipped 'task/pdir'
A task/pdir/file1.txt
A task/pdir/file2.txt
Skipped 'task/bdir'
C task/bdir/file3.txt
A task/bdir/message.txt

The log of tags/rel-1.0 shows:
    svn log https://my.svnserver/svn/app/tags/rel-1.0
    ------------------------------------------------------------------------
    r97 | vuser | 2008-09-23 15:49:11 -0400 (Tue, 23 Sep 2008) | 1 line
    [app tags rel-1.0] adding task directory to vendor tag

I created the rel-1.0 tag earlier from trunk earlier ->

    svn log https://my.svnserver/svn/app/trunk
    ------------------------------------------------------------------------
    r74 | vuser | 2008-08-29 14:52:18 -0400 (Fri, 29 Aug 2008) | 1 line
    [app] Tagging rel-1.0 - vendor code

I created custom-1.0 just recently (right before we applied that
latest vendor drop):

    svn log https://my.svnserver/svn/app/tags/custom-1.0
    ------------------------------------------------------------------------
    r141 | vuser | 2008-11-19 11:46:10 -0500 (Wed, 19 Nov 2008) | 1 line
    [app] Tagging custom-1.0

    <snip customization comments>

    ------------------------------------------------------------------------
    r98 | vuser | 2008-09-23 15:51:39 -0400 (Tue, 23 Sep 2008) | 1 line
    [app] adding task directory: added to tags 1.0

The svn list returns the following for the left, right and working
copy (a dir listing):
LEFT: svn https://my.svnserver/svn/app/tags/rel-1.0/
task/

RIGHT: svn list https://my.svnserver/svn/app/tags/custom-1.0/
anewdir/
task/

WC: ls -F
anewdir/
task/

I am not sure what other information would be helpful. Thanks for
your assistance.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-21 16:24:46 CET

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.