On Thu, 2007-09-13 at 10:03 -0700, Hari Kodungallur wrote:
>
> On 9/12/07, Mark Reibert <svn@reibert.com> wrote:
> Now "svn log -v" shows the top-level directory of the merge as
> 'A', but
> everything else - directories and files - have an action of
> 'R'. Here is
> a sanitized piece of the output:
>
> Changed paths:
> A /branches/B/foo (from /branches/A/foo:1407)
> R /branches/B/foo/bar (from /branches/A/foo/bar:1407)
>
> and so on. The only discussion I can find in the turtle book
> is in the
> context of "svn up", where 'R' means "replaced". This does not
Oops, I meant "svn st" ...
> The 'R' flag represent the same meaning for log, status, update, merge
> etc. It means replaced. If my understanding is right, replaced means
> that you deleted and added a file in the same revision. That is, you
> do a "svn rm" of the file (don't commit it) and then "svn add" a file
> with the same name. Then do the commit. At this point you will see
> that the commit happens as "R". And hence the log will also show this
> revision as an "R".
Presumably yes, but this is the part that does not make sense. For my
case, the merge simply added *new* directories/files to the target
branch (via the working copy). As I noted, "svn st" on the working copy
after the merge shows everything as "A +", which I expect. What I don't
understand is why after committing "A +" I get 'R' from "svn log". And
why does the top-level new directory show 'A' while all its children
show 'R'?
I have to believe I am overlooking something very fundamental here ...
--
----------------------
Mark S. Reibert, Ph.D.
svn@reibert.com
----------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 14 06:10:23 2007