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

RE: Re: Merge Question

From: Brian Erickson <erickson_at_BAUERCONTROLS.com>
Date: Thu, 5 Jun 2008 11:15:10 -0400

Wow, I guess reading and understanding are two different things...Sorry
to trouble you...

Brian

-----Original Message-----
From: Stefan Sperling [mailto:stsp_at_elego.de]
Sent: Thursday, June 05, 2008 10:37 AM
To: Brian Erickson
Cc: users_at_subversion.tigris.org
Subject: Re: Merge Question

On Thu, Jun 05, 2008 at 10:30:26AM -0400, Brian Erickson wrote:
> Attempt #1 to merge in a change (notice no output)
>
> pcs4.2.10.0 I:\pcs\workstation\server>svn merge --revision
766:767
> --dry-run http://snidely/svn/pcs/trunk \
>
>
> Attempt #2 to merge in a change (notice this one got the one file
that
> changed)
>
>
> pcs4.2.10.0 I:\pcs\workstation\server>svn merge --change 766
--dry-run
> http://snidely/svn/pcs/trunk \
> U \pcs\workstation\server\filterfile.c
>
>
> I thought I understood from the docs that the two forms above were
> equivalent but I must be missing something. Can anyone shed any
light on
> the situation?

They're not equivalent.

 -c [--change] arg : the change made by revision ARG (like -r ARG-1:ARG)

So --change 766 means --revision 765:766, not --revision 766:767.

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-06-05 17:15:35 CEST

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