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

Re: svnmerge Documentation?

From: Kenichi Nakamura <knakamur_at_tripwire.com>
Date: 2007-03-15 20:04:27 CET

Brad,

http://svn.collab.net/repos/svn/trunk/contrib/client-side/
svnmerge.README

see svnmerge.py and svnmerge.sh in the same dir. apart maybe from
joining the list, i think ocraware site is the best doc.

-k

On Mar 15, 2007, at 11:52 AM, Andrew Close wrote:

> On 3/15/07, Brad Harper <brad.harper@epsiia.com> wrote:
>>
>> > -----Original Message-----
>> > From: Andrew Close [mailto:aclose@gmail.com]
>> > Sent: Thursday, March 15, 2007 1:27 PM
>> > To: Brad Harper
>> > Cc: users
>> > Subject: Re: svnmerge Documentation?
>> >
>> >
>> > On 3/15/07, Brad Harper <brad.harper@epsiia.com> wrote:
>> > > Hello:
>> > >
>> > > Apart from
>> > >
>> > > http://www.orcaware.com/svn/wiki/Svnmerge.py
>> > >
>> > > [assuming that this content is current], is there
>> > > documentation for 'svnmerge'?
>> > >
>> > > There is a comment within that info reading
>> > >
>> > > "... you are still encouraged to read the full manual ..."
>> > >
>> > > but without references.
>> >
>> > that comment is probably referring to the SVN manual that's
>> > available online:
>> > http://svnbook.red-bean.com/en/1.0/svn-book.html#svn-ch-4
>> >
>> > andy
>> >
>>
>> Thanks.
>>
>> I've read that 'svnmerge' is distributed with subversion;
>> but looking at a [win32] installation, I don't find it.
>
> are you referring to a separate tool? or the merge command within
> svn?
> C:\>svn merge 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
> 2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
> 3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 15 20:05:05 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.