RE: How is R - replace performed ?

> Van: Stefan Sperling [mailto:stsp_at_elego.de]
> 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.

Another "nasty" way:
"svn mv file file2", and then "svn mv file2 file".

This causes a replace (without maintaining history), causing a lot of grief for us (happens regularly during refactoring -> dev changes his mind about a rename, in the middle of a big refactoring).

See http://subversion.tigris.org/issues/show_bug.cgi?id=3429

Regards,
Johan

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2397243

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-21 11:09:22 CEST