[Svnmerge] Bugs when merging revisions that modify and deletefiles

[Jack Repenning]

On Jan 10, 2007, at 11:47 AM, Giovanni Bajo wrote:

> Which scenarios do you devise, given a clean working copy, in which  
> the "skipping" message might appear during a svnmerge merge operation?

I must misunderstand this question -- isn't that the root message of  
this thread?

   http://www.orcaware.com/pipermail/svnmerge/2006-December/000791.html

and also the earlier thread:

   http://www.orcaware.com/pipermail/svnmerge/2006-February/000215.html

I won't go into the full details; they're in those messages and arise  
from fairly specific event sequences, but as a summary handle to  
tickle the memory: the situation arises when the history to be merged  
includes mutually invalidating changes, like "a change to a file,  
followed by a delete of that file."


-==-
Jack Repenning
Director, Software Product Architecture
CollabNet, Inc.
8000 Marina Boulevard, Suite 600
Brisbane, California 94005
office: +1 650.228.2562
mobile: +1 408.835.8090
raindance: 844.7461
aim: jackrepenning
skype: jrepenning