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

Re: "Check for Modifications" after "Switch" of subdir

From: Stefan K√ľng <tortoisesvn_at_gmail.com>
Date: 2006-04-18 18:07:01 CEST

Matthias Wächter wrote:
> Folks,
>
> After creating a repository containing a trunk and one branch, I try to
> switch a subdirectory. First, let's create and setup the repos:
>
> $ # ---- preparing the repository START
> $ mkdir repos; svnadmin create repos
> $ REPOS=file://`pwd`/repos
> $ mkdir imp imp/trunk imp/trunk/subdir imp/branches
> $ echo "line1-trunk" > imp/trunk/subdir/file1
> $ svn import -m "" imp $REPOS
> Adding imp/trunk
> Adding imp/trunk/subdir
> Adding imp/trunk/subdir/file1
> Adding imp/branches
>
> Committed revision 1.
> $ svn cp -m "" $REPOS/trunk $REPOS/branches/br1
>
> Committed revision 2.
> $ svn checkout $REPOS/branches/br1
> A br1/subdir
> A br1/subdir/file1
> Checked out revision 2.
> $ echo "line1-branch" > br1/subdir/file1
> $ svn commit -m "" br1
> Sending br1/subdir/file1
> Transmitting file data .
> Committed revision 3.
> $ rm -Rf imp br1
> $ # ---- preparing the repository END
>
> using the SVN CLI switching a subdirectory of a checked-out directory to
> a branch works and looks like the following:
>
> $ REPOS=file://`pwd`/repos
> $ svn checkout $REPOS/trunk
> A trunk/subdir
> A trunk/subdir/file1
> Checked out revision 3.
> $ cd trunk
> $ svn switch $REPOS/branches/br1/subdir subdir
> U subdir/file1
> Updated to revision 3.
> $ svn st
> S subdir
> $ svnversion .
> 3S
>
>
> This means, SVN (both "svn" and "svnversion") is aware of the fact that
> even if there are no local changes, it is a non-consistent checkout due
> to the fact that "subdir" is now taken from a branch. This way I will
> never miss this fact.
>
> In TSVN, after switching the subdirectory to the branch in the same way,
> I don't have any chance of monitoring this inconsistency of the
> checked-out tree. "Check for Modifications", executed on the "trunk"
> directory with the switched subdir, gives "file list is empty", and I
> don't see any other option being equivalent to the CLI's "svn status".
>
> So my question: Is there any way of noticing that the tree is
> inconsistent related to subdirectory switching? Is anyone missing this
> feature like me? :-)

Yes, with a nightly build you can see those. It's implemented in HEAD,
and as of revision 6322 those items are even shown if they have the
status 'normal'.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Apr 18 18:07:29 2006

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