You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Giulio Troccoli <Gi...@uk.linedata.com> on 2007/07/30 14:35:34 UTC

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

Re: About svn merge -c

Posted by Nathan Nobbe <qu...@gmail.com>.
im sorry, i would  comment, but i havent used svn merge at all.  i still
need to understand how it is supposed to be used in the first place.

-nathan

On 8/1/07, Giulio Troccoli <Gi...@uk.linedata.com> wrote:
>
> No-one wants to comment on this? Really?
>
> > -----Original Message-----
> > From: Giulio Troccoli [mailto:Giulio.Troccoli@uk.linedata.com]
> > Sent: 30 July 2007 15:36
> > 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
>
>

RE: About svn merge -c

Posted by Giulio Troccoli <Gi...@uk.linedata.com>.
No-one wants to comment on this? Really?

> -----Original Message-----
> From: Giulio Troccoli [mailto:Giulio.Troccoli@uk.linedata.com]
> Sent: 30 July 2007 15:36
> 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


Re: About svn merge -c

Posted by Ryan Schmidt <su...@ryandesign.com>.
On Aug 3, 2007, at 15:13, Brian Erickson wrote:

> If you have changes from 3
> developers you'd have 3 separate merges with 3 separate revision
> numbers.  Do you have to merge the changes in the right order?

If the changes depend on one another, then yes, you probably do have  
to merge them in the same order in which they were initially  
committed. But if they're changes to separate files, or unrelated  
parts of the same file, then it shouldn't matter.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

RE: RE: About svn merge -c

Posted by Brian Erickson <er...@BAUERCONTROLS.com>.
I'm going to be trying to set up the same kind of thing here and was
curious if you have any 'order' problems.  If you have changes from 3
developers you'd have 3 separate merges with 3 separate revision
numbers.  Do you have to merge the changes in the right order? 

Brian

> -----Original Message-----
> From: Jason Winnebeck [mailto:jpwasp@rit.edu] 
> Sent: Friday, August 03, 2007 3:08 PM
> 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
> 
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org


RE: About svn merge -c

Posted by Giulio Troccoli <Gi...@uk.linedata.com>.
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


RE: About svn merge -c

Posted by Jason Winnebeck <jp...@rit.edu>.
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