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

Re: svn merge output: "R"

From: Ben Reser <ben_at_reser.org>
Date: Thu, 05 Dec 2013 09:32:23 -0800

On 12/5/13 9:29 AM, C M wrote:
> Hello.
>
> I ran "svn merge --reintegrate --dry-run" against branch. As part of the
> dry-run preview, several files are marked with:
>
> R path-to-file\src\Update.c
>
> What does the "R" mean? I haven't encountered it before. Can someone please
> explain?
> Thank you.

From `svn help merge`:
[[[
  For each merged item a line will be printed with characters reporting the
  action taken. These characters have the following meaning:

    A Added
    D Deleted
    U Updated
    C Conflict
    G Merged
    E Existed
    R Replaced
]]]

File we deleted and then added or copied in again.
Received on 2013-12-05 18:33:02 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.