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

Re: More strange merge conflicts.

From: Erik Wasser <erik.wasser_at_iquer.net>
Date: 2005-07-30 19:23:19 CEST

On Saturday 30 July 2005 17:21, Ben Collins-Sussman wrote:

> This is your mistake. If you first run
>
> svn merge -r 50:100 trunkURL
>
> ...and then two weeks later, run
>
> svn merge -r 101:200 trunkURL

Ups. I understood the concept or revisions that I merge the changes made
in revision A,A+1,...,B-1,B to the other branch.

But I seems that svn merges the changes between(!) A - A+1 and A+1 -
A+2, ..., B-1 - B to the other branch. Is that correct?

I've read the manual but I haven't found a clear statement about this
behavior so I'm a little confused now. B-)

-- 
So long... Fuzz
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 30 19:25:16 2005

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