On 9/12/07, Mark Reibert <svn@reibert.com> wrote:
>
> Hello,
>
> I merged some changes on branch A to branch B via a working copy on
> branch B. Pretty straightforward; the command was conceptually:
>
> svn merge -r x:y http://blabla/repo/branches/A <wc_path>
>
> This merge only added directories and files to branch B. "svn st" looked
> good - all files were "A +" showing additions with history. So I
> checked in.
>
> 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 make
> sense in the context of "svn log" for dirs/files that were added.
>
> So what is the 'R' action in "svn log -v"?
>
> Server is v1.2.3 (Linux), client is v1.4.5 (Win32).
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".
Regards,
-Hari Kodungallur
Received on Thu Sep 13 19:00:18 2007