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

Re: svn merge question

From: Troy Curtis Jr <troycurtisjr_at_gmail.com>
Date: 2007-10-17 04:59:09 CEST

On 10/16/07, Kamesh Jayachandran <kamesh@collab.net> wrote:
> Hi,
>
> >
> > I confirmed that you are right. I also did 'svn merge -r8:23
> > $R/trunk' and the result was the same, except that the output said
> > "Merging r9 through r23 into '.'".
> >
> > Has there been any discussion or suggestions about allowing the
> > specification of relative paths?
>
> In r27191 We fixed the merge-notifications to be more clear. Can you try
> with that.
>

Yep it worked great!

> > One of the really nice improvements
> > to svnmerge was not having to use full URLs every time. I know that
> > the requirements are a little different because with svnmerge you
> > always had to 'svnmerge init $URL' first and it could count on having
> > a directory property there with all the possibilities. The built-in
> > subversion doesn't necessarily have that luxury. But perhaps some
> > kind of notification that represents the root URL of the current
> > working copy?
> >
> >
>
> In fact merge source url can be optional(if invoked with -g), it
> defaults to copy source of the target if one exists or the first merge
> source from its (svn:mergeinfo).
>

I also tested this out and it worked like a charm. Still for any
other case you would have to type out the root url to the repository
which could add a lot of typing. You can't even use copy-n-paste from
the 'mergeinfo' output.

Was there already some discussion about allowing these kind of
relative URLs? If Subversion did support them I guess there would
have to be a way to disambiguate them from working copy paths. And if
it *were* implemented, would it go into the svn client code or the
working copy library?

> With regards
> Kamesh Jayachandran
>

-- 
"Beware of spyware. If you can, use the Firefox browser." - USA Today
Download now at http://getfirefox.com
Registered Linux User #354814 ( http://counter.li.org/)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 17 04:59:25 2007

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