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

RE: RE: About svn merge -c

From: Brian Erickson <erickson_at_BAUERCONTROLS.com>
Date: 2007-08-03 22:13:45 CEST

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
Received on Fri Aug 3 22:14:35 2007

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