You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Brian Erickson <er...@BAUERCONTROLS.com> on 2008/06/05 14:30:26 UTC

Merge Question

Hi all,
 
I have a working copy (checked out from a branch).  The branch was
created from the trunk at revision 730.
 
Here is the info from the working copy...
 

	pcs4.2.10.0 I:\pcs\workstation\server>svn info
	Path: .
	URL:
http://snidely/svn/pcs/branches/pcs4.2.10.0/pcs/workstation/server
	Repository Root: http://snidely/svn/pcs
	Repository UUID: ac9423d5-b5e3-b84e-aea3-6091112c9e7f
	Revision: 747
	Node Kind: directory
	Schedule: normal
	Last Changed Author: gourlay
	Last Changed Rev: 727
	Last Changed Date: 2008-05-07 13:36:20 -0400 (Wed, 07 May 2008)

 
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://sn <http://snidely/svn/pcs/trunk> idely/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?
 
My info:
Windows XP Pro Service pack 3
Subverion 1.4.6
Using Apache to access the repository.
 
Thanks,
Brian

RE: Re: Merge Question

Posted by Brian Erickson <er...@BAUERCONTROLS.com>.
Wow, I guess reading and understanding are two different things...Sorry
to trouble you...

Brian 

-----Original Message-----
From: Stefan Sperling [mailto:stsp@elego.de] 
Sent: Thursday, June 05, 2008 10:37 AM
To: Brian Erickson
Cc: users@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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: Merge Question

Posted by Stefan Sperling <st...@elego.de>.
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