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

Re: Merging - why do I need a path ?

From: Kalin KOZHUHAROV <kalin_at_thinrope.net>
Date: 2005-11-01 17:20:37 CET

PLEASE do consider NOT posting HTML to any mailing list.

Shakespeare, Simon (Pensions) wrote:
> Hi - Can anybody explain to why when doing a merge you need to enter the
> path in the following manner:
>
> svn merge --dry-run -r 40:41 svn://ipofserver/phoenix/trunk/gui/mpa
> c:/scstest/hiptapp/mpa

http://svnbook.red-bean.com/nightly/en/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.keyconcept

Because this is the syntax basicly :-)

> I'm trying to merge the commit that resulted in revision 41 - surely
> subversion knows what path(s) in the repository that revision 41 related
> to so why can't I just enter svn://ipofserver - I can sort of undertand
> why I need to enter a destination path for my working copy but am a
> confused what happens if revision 41 included several files in different
> directories - do you just use the top most path as the path for your
> working copy.

What about:
svn merge -r 10:10000 $URL $WD
svn applies the changes incrementally, AFAIK, so it needs a space to apply them ($WD)

The rule I follow is to merge only whole branches to trunk (or other branches),
so the path is known.

> The reason I wanted to do this was to try & simplify my merging. When I
> do a commit I store that revision against a ticket number in a database
> & assumed that it would have been sufficient just to store the revision
> number rather than all the paths.
Can you clarify that?

> Thanks - Can you include me in the reply as I not a member of the users
> mailing group - well I was but I got swamped with emails & my boss
> wasn't happy !
Then how do you stay current to the technology?
This is a very informative ML, so talk to your boss, about that. I did it and it worked.

Kalin.

-- 
|[ ~~~~~~~~~~~~~~~~~~~~~~ ]|
+-> http://ThinRope.net/ <-+
|[ ______________________ ]|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 1 17:32:20 2005

This is an archived mail posted to the Subversion Users mailing list.