[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-issues
Subject:    [Issue 3686]  executable flag not correctly set on merge
From:       neels () tigris ! org
Date:       2011-07-29 12:14:49
Message-ID: 20110729121449.BB3C4540078 () sc157-tigr ! sjc ! collab ! net
[Download RAW message or body]

http://subversion.tigris.org/issues/show_bug.cgi?id=3686






------- Additional comments from neels@tigris.org Fri Jul 29 05:14:49 -0700 2011 -------
Note that this is fixed on trunk (1.7dev) but not on 1.6.x.

Here is a simpler testcase which uses a reverse merge on a modified executable:

# create clean repos/wc
BASE="/tmp"
REPOS="$BASE/repos"
WC="$BASE/wc"
URL="file://$REPOS"
svnadmin create "$REPOS"
svn co -q "$URL" "$WC"

# actual test
cd "$WC"
cp `which basename` file
svn add file
svn ci -mm
svn up

cp `which dirname` file
svn ci -mm
svn up
svn pl -v file
ls -l file

svn merge -r 2:1 ./file
svn pl -v file
ls -l file


With svn from branches/1.6.x@1152165 the final ls -l shows that the
"x" permissions have gone missing during the merge.

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2805936

To unsubscribe from this discussion, e-mail: [issues-unsubscribe@subversion.tigris.org].
[prev in list] [next in list] [prev in thread] [next in thread]