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

Replacing Action during Merge - Not Encountered this Before

From: Michael Whitby <m.whitby_at_gmail.com>
Date: Thu, 22 Jan 2009 10:22:46 +0000

Hi all, I'm new to subversion and SCC in general and am getting on pretty
well with it, however I've just seen the "Replacing" action in my logs and
have not seen it before so am not sure what to make of it. I've had a google
around but no success, so I'll explain what happened:

I'm using the trunk, branches and tags structure and using this methodology:

I Perform small commits straight to trunk, anything larger will be branched
as a feature branch and then re-merged to trunk when complete
If any commits or merges to the trunk should be included in a release they
are merged with the release branch (which is currently 1.0)
When the app is 'shipped' (its a web app), its tagged as 1.0.0 for example

So, I created a feature branch, whose path was
I completed the feature so merged into the trunk, so I merged the head of
/branches/special-instructions into /trunk
I also noticed a bug at this time, so performed a commit straight to the
The app already had a release branch, which was /branches/1.0, both the
changes made needed including in this release so I merged the relevant 2
revisions from the trunk

I noticed afterward, while looking at the log, that the "action" for many of
the files and directories was "Replacing" - being as a lot of these files
and directories were new (they weren't previously in the trunk), I expected
to just see "Added" - how come I am seeing "Replacing"?

Thanks in advance for the help, the end result seems fine but I want to
understand why I saw this action.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-01-22 18:26:33 CET

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.