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

Re: Is merging branches reliable?

From: Marc Haisenko <haisenko_at_comdasys.com>
Date: 2006-05-08 10:37:28 CEST

On Saturday 06 May 2006 11:01, Zsolt wrote:
> You are right it shouldn't happen but IT DOES happen.
> I will test it with svn-1.3.1 and if that doesn't help we will go back to
> CVS.
> We have never ever had such problems with CVS.
> Zsolt

SubVersion doesn't do any voodoo and doesn't make up any data/changes. It
really has a reason that these reasons appear, and I think it's just that
you've maybe misinterpreted something about how merging works.

I understand that you're probably frustrated because you don't immediately
spot the problem, but believe us when we say that there really is a reason
that you get the changes.

Have you done a "svn diff a.java" on the file with the merge changes ? Do you
recognize these changes ?


Marc Haisenko
Comdasys AG
Rüdesheimer Straße 7
D-80686 München
Tel:   +49 (0)89 - 548 43 33 0
Fax:   +49 (0)89 - 548 43 33 29
e-mail: haisenko@comdasys.com
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 8 10:38:43 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.