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.

Reply via email to