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

Re: Merge 'R' -- what the h* is it? (was: Merge 'G' -- what the h* is it?)

From: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 3 Sep 2009 14:26:45 +0100

On Thu, Sep 03, 2009 at 01:54:18PM +0200, Carsten Koch wrote:
> Hi,
> here is another funny merge status code:
> % svn merge -r114504:114505 http://svn/caa/mods/bs-caa-OpTopPerfo-CellRestructuring
> --- Merging r114505 into '.':
> R src/Products/ICMOperatorTop/ICMCLAOperators.m/src/ICMCLACellRestructuring.cpp

It means "replaced".

I've added documentation for the 'R' code to 'svn help update'
and for all codes to 'svn help merge' in r39102.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-03 15:27:50 CEST

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.