Simon Kitching wrote:
> Hi,
>
> I've been working on some code in trunk; it has got a little more
> complex than I originally thought so I decided to check it in as a
> branch "allow-flawed" so people can review it without me damaging the
> trunk.
>
> So the "trunk" dir in my working copy has a number of modified files in
> it.
>
> I did:
> cd branches
> svn cp ../trunk allow-flawed
> svn commit allow-flawed
> [r188671 created]
>
> svn log -v -r188671:HEAD allow-flawed
>
> The output of the svn log command shows about a dozen files/directories
> as status "R" (replaced???). These files certainly have *not* been
> deleted/readded in trunk. And many of them are files that haven't been
> touched for ages.
>
> Any ideas what I might be doing wrong here?
>
> The repo in question is publicly accessable:
> http://svn.apache.org/repos/asf/jakarta/commons/proper/logging/branches/allow-flawed/
Those replace operations are recording the mixed-revision status of your
working copy at the time of the "svn copy".
For more info on mixed revision working copies, see this section of the
svnbook:
http://svnbook.red-bean.com/en/1.1/ch02s03.html
The short version is: Use "svn update" to bring your working copy to a
single revision unless you deliberately *want* to make use of mixed-revision
copies.
Max.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 7 11:20:40 2005