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

Re: How is R - replace performed ?

From: Stefan Sperling <stsp_at_elego.de>
Date: Fri, 18 Sep 2009 16:53:45 +0100

On Fri, Sep 18, 2009 at 10:20:43AM -0500, Paul Hammant wrote:
> Does anyone know how you make a R (replace) item in a merge from a
> branch its trunk? We see some items historically that are marked with
> R, but can't ask the guy that did it. We're wanting to reproduce this
> situation, but need to know more about how to make it happen.

"svn rm file", and then "svn copy otherfile file"
"svn rm file", and then create file again and "svn add file"

Nasty: "svn rm dir", then "rm -rf dir", then "svn mkdir dir"
or "svn copy otherdir dir".
This works, but that it works is actually a bug and very nasty,
because you're blowing away a .svn directory during "rm -rf dir".

Then commit, and then merge that revision to another branch.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-18 17:54:55 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.