[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 ? (last message reformatted)

From: Ryan Schmidt <subversion-2005_at_ryandesign.com>
Date: 2005-11-02 18:45:49 CET

On Nov 2, 2005, at 16:46, Joshua Varner wrote:

>>>> 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.copycha
>>> nges.html#svn.branchmerge.copychanges.keyconcept
>>> Because this is the syntax basicly :-)
>> Would you agree that it's not necessary ?
> Subversion makes the assumption that automatic merges
> should not be trusted to be perfect, therefore there must be
> a working copy to which to apply the changes, for human
> inspection. Either way you need three urls: from, to and target.
> Sometimes from and target are the same, but not always.

No, you need two URLs and a path—two URLs in the repository to
compare, and a local filesystem path to merge the changes into—just
as the example above shows.

>>>> 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.

Subversion sends back a diff with paths relative to the path you
give. If revision 41 changed the path /phoenix/trunk in the
repository, then the diff sent back by asking for svn merge -r 40:41
svn://ipofserver would give you relative paths starting with phoenix/
trunk. If you have the identical directory structure on your hard
drive as in the repository, then you can certainly do it that way.
But it won't work if you name your local directories differently,
like phoenix-project/trunk or phoenix-trunk.

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 2 18:47:50 2005

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.