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

RE: About svn merge -c

From: Giulio Troccoli <Giulio.Troccoli_at_uk.linedata.com>
Date: 2007-08-06 10:16:58 CEST

That's true, but I wasn't using that syntax of merge.

ln1sub01 svn> svn help merge
merge: Apply the differences between two sources to a working copy path.
usage: 1. merge sourceURL1[@N] sourceURL2[@M] [WCPATH]
       2. merge sourceWCPATH1@N sourceWCPATH2@M [WCPATH]
       3. merge [-c M | -r N:M] SOURCE[@REV] [WCPATH]

I was using syntax 1, which I supposed is equivalent to syntax 3, but it
may well be that I'm wrong. As I said I haven't notice any errors or
problems so far, but I'd like to know whether they are really equivalent
or not.

Giulio

> -----Original Message-----
> From: Jason Winnebeck [mailto:jpwasp@rit.edu]
> Sent: 03 August 2007 20:08
> To: Giulio Troccoli; users@subversion.tigris.org
> Subject: RE: About svn merge -c
>
> The svn merge documentation seems to be quite clear to me that -c x is
> the same as "-r x-1:x", so yes from how I read it they seem identical.
>
> Jason
>
> -----Original Message-----
> From: Giulio Troccoli [mailto:Giulio.Troccoli@uk.linedata.com]
> Sent: Monday, July 30, 2007 10:36 AM
> To: users@subversion.tigris.org
> Subject: About svn merge -c
>
> In my company we have a process to automatically propagate changes.
This
> (Korn shell) script used to do something like
>
> svn merge URL/To/Source@PREV_REV URL/To/Source@REV Path/To/Source
>
> Where of course PREV_REV is REV-1. I thought about using the the
> --change option of the svn merge command and do something like this
>
> svn merge --change REV URL/To/Source Path/To/Source
>
> It seems to work, however, I might be wrong but, was I using peg
> revisions? If so, are the two really equivalent?
>
> Thanks
> Giulio
>
>
> Linedata Services (UK) Ltd
> Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1
> 6DB
> Registered in England and Wales No 3027851 VAT Reg No 778499447
>
> ---------------------------------------------------------------------
> 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 Mon Aug 6 10:15:31 2007

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