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

RE: Problems with svn merge on merging a whole branch to another

From: Dale Worley <dworley_at_pingtel.com>
Date: 2005-06-14 19:40:22 CEST

> From: Thomas Mauch [mailto:thomas.mauch@gmx.net]
>
> What do you think can cause such a problem (I'm using Subversion 1.2)?
> Any help appreciated

It's very difficult to guess what *might* be going on in your repository,
since you've told us nearly nothing about it. What would help is specific
answers to these questions:

1) For the file name in question, has it lineally descended from rev 503, or
have there been copy operations involved?

2) When you created the branch, was it just a copy from the trunk, or a copy
with changes? If there were changes, what exactly were they?

3) What is each and every change to this file on the trunk from 503 to HEAD?
What is each and every change to this file on the branch from 503 to HEAD?

If you told us this, we *might* be able to guess what the problem is.

Dale

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jun 14 19:44:04 2005

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