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

svn merge failure with added executable files?

From: Josh Pieper <jpieper_at_andrew.cmu.edu>
Date: 2003-08-12 20:20:16 CEST

I'm having trouble merging when files are added that have the
executable bit set. Using 0.26, I get the following message:

svn: Can't find an entry
svn: Can't merge props into 'missing':it's not under revision control.

We were able to work around it by adding the file to the branch
manually by:

  touch file
  svn add file

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.

Is this a known problem? Will it be fixed in an upcoming version?

Josh Pieper

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 12 20:21:12 2003

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