You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Carsten Koch <Ca...@web.de> on 2009/09/03 11:54:18 UTC
Re: Merge 'R' -- what the h* is it? (was: Merge 'G' -- what the h*
is it?)
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
On Mon, 2008-06-23 at 22:49 +0200, Miha Vitorovic wrote:
...
> As you already noticed, svn is a bit
> help-challenged in certain areas :)
...
> merGed -- meaning that there were local modifications in the file *and*
> new changes brought in via the merge (or update), but the two did not
> conflict (otherwise you would have seen "C").
>
> See:
>
> svn help update
> svnbook.red-bean.com
>
> It would be nice if 'svn merge' pointed the user to the help for update,
> since they use the same status letters.
Neither "svn help merge" nor "svn help update" explains the R.
I also did not find it on
http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.merge.html
or on
http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.update.html
I did find it on
http://svnbook.red-bean.com/nightly/en/svn.ref.svn.c.status.html
but when you do a "delete/commit/add" on the same name,
"svn status" does not show "R". It shows "A"!?
Crazy, huh?
Cheers,
Carsten.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390609
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merge 'R' -- what the h* is it? (was: Merge 'G' -- what the h*
is it?)
Posted by Carsten Koch <Ca...@web.de>.
On Thu, 2009-09-03 at 14:26 +0100, Stefan Sperling wrote:
> On Thu, Sep 03, 2009 at 01:54:18PM +0200, Carsten Koch wrote:
...
> > --- 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.
Thanks, excellent!
Carsten.
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390673
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: Merge 'R' -- what the h* is it? (was: Merge 'G' -- what the h*
is it?)
Posted by Stefan Sperling <st...@elego.de>.
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.
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2390649
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].