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

Re: svn merge failure with added executable files?

From: Josh Pieper <jpieper_at_andrew.cmu.edu>
Date: 2003-08-12 21:14:54 CEST

> > I think it can be reproduced by making a simple repository with a
> > branch. Add an executable file to the trunk. Then attempt to merge
> > this change into the branch.
>
> Can you write a script that does this? Concrete examples (as opposed
> to descriptions of examples) are ten times easier to reproduce :-).

Attached is the script. The bug seems to only be triggered when the
--dry-run option is given to merge. This is actually a better
workaround than the one I gave previously... don't try a dry-run
first.

-Josh

-- 
Beware of low-flying butterflies.


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

Received on Tue Aug 12 21:15:43 2003

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