subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Philip Martin <philip.mar...@wandisco.com>
Subject Re: Subversion Issue: 'delete file' not transmitted to server when performing multiple merge-commit
Date Thu, 13 Jan 2011 19:51:20 GMT
<Neil.Tuffs@rwe.com> writes:

> My user reported that an extra file existed in the repository after
> performing a merge (claiming this file was not in his working copy prior
> to the commit).  My initial thought was they had done the merges out of
> sequence causing the deletion of a file before it was added, the user
> was adamant this was not the case.

A simpler sequence:

  rm -rf repo wc file
  touch file
  url=file://`pwd`/repo
  svnadmin create repo

  svn mkdir -mm $url/trunk
  svn cp -mm $url/trunk $url/branch
  svn import -mm file $url/branch/folder/file
  svn rm -mm $url/branch/folder/file

  svn co $url/trunk wc
  svn merge $url/branch@3 wc
  svn merge $url/branch@4 wc

The first merge adds a folder containing a file, the second merge
deletes the file.  After the two merges 1.6 shows status:

 M    wc
A  +  wc/folder

This is a problem because folder's history is a copy from a revision
where it contains the file, so the file will exist in repository after
the commit.  Using 1.7 status shows:

 M    wc
A  +  wc/folder
D  +  wc/folder/file

so 1.7 will delete explicitly the file when the merge is committed.

-- 
Philip

Mime
View raw message