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 .
p.s. I know that the above command does seem to work as I expect using
command line, but using SVNKit it does not. I have already posted a message
on their board about it, but I feel the problem may not be SVNKit, but my
understanding of the merge paramters.
2) Pertaining to merging.. How do I know when I need to specify a specific
revision number (as I will not always know it) and when I can use BASE or
HEAD? What exactly does HEAD and BASE mean in relation to both remote URLs
and local working copies? In every case that we currently use, I always
want to merge the latest "fully committed" changes from one copy to the
latest "fully committed" changes to a remote copy (i.e. URL). Is HEAD the
correct keyword? Should I be merging from HEAD of the remote copy (URL) to
the HEAD of the working copy?
--
View this message in context: http://www.nabble.com/Help-with-Subversion-semantics.-tf4430991.html#a12640696
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
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:54:25 2007