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

Is merge broken?

From: Ignacy Gawedzki <svn_at_qult.net>
Date: 2005-04-04 16:07:06 CEST

I had a problem while merging a branch into the trunk of my project. I
managed to isolate the problem into a very simple case.

The session script attached illustrates it.

In the specific case of my project, I had to merge each branch revision
separately to ensure everything will go fine, which as you could imagine was a
very tedious process. Later, I experimented the same merge but with the
--ignore-ancestry option and everything seemed to work properly. :/

Anyway, I suppose that --ignore-ancestry is not necessarily preferable in a
real-world scenario...

Any idea or suggestion?

-- 
I drive way too fast to worry about cholesterol.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Received on Mon Apr 4 16:08:27 2005

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