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

Re: Help with Subversion semantics.

From: Blair Zajac <blair_at_orcaware.com>
Date: 2007-09-12 23:28:36 CEST

Hari Kodungallur wrote:
> On 9/12/07, *Marc.Farrow* <marc.farrow@gmail.com
> <mailto:marc.farrow@gmail.com>> wrote:
> I have a few questions. They deal with the correct way to invoke SVN
> commands. I will set up a scenario and that scenario will be used
> in both
> situations and questions.
> Let's say I have two copies of a project in a Subversion
> repository. One is
> the trunk and the other is branch1. Branch1 is a copy of trunk at a
> certain
> revision; let's say revision A. I make lots and lots of changes to
> working
> copy that is pointing to Branch1 and I commit all those changes to
> Branch1.
> I delete the working copy. Let's say while I am working on the
> changes in
> Branch1, someone else comes along and checks out the trunk and makes
> some
> changes in one or more files that I have changed in Branch1 and commits
> them. These changes "should" cause a conflict when merged. I
> come along
> a few days later and check out Branch1 again.
> 1) I want to merge the changes with the trunk into my "new" working
> copy of
> Branch1. I expect a conflict. Here is the command I want to
> use. Would
> this be the correct command? (I am in my current working directory
> in my
> shell).
> svn merge -r HEAD http://repository/repos/project/trunk .
> I believe you should be using "svn merge -r <FROM_REV>:HEAD
> http://repository/repos/project/trunk ."
> The FROM_REV here is the the revision from which you want to merge the
> changes. In this case looks like it is the revision where you created
> Branch1.

BTW, you shouldn't use HEAD in a merge statement, since you can't be entirely
sure which revisions you've merged if somebody gets a commit in around the time
you do your merge command. So always uses a fixed revision number.

And better yet, as Hari suggested, use svnmerge.py until 1.5 comes out.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Sep 12 23:25:27 2007

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.