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

Re: bug with repeated merges of deletion

From: Bhuvaneswaran Arumugam <bhuvan_at_collab.net>
Date: Tue, 6 May 2008 18:26:54 +0530

On Tue, 2008-05-06 at 13:59 +0200, Stefan Sperling wrote:
> On Tue, May 06, 2008 at 01:19:58PM +0200, Stefan Sperling wrote:
> > Attached is a simple shell script that triggers the bug for me
> > with most recent 1.5.x.

I do not face the issue with the script, but the reported bug is still
valid. I can repeat this issue on trunk. Please find attached the
revised script for reference.

Exact steps I do in this script:

     1. Create the repos
     2. Create a trunk
     3. Add new file 'a' in trunk and commit
     4. Create a branch from trunk
     5. Add new file 'b' in trunk and commit
     6. Merge from trunk to branch and commit
     7. Delete file 'a' in trunk and commit
     8. Merge from trunk to branch twice
    First time, the merge is successful, it schedules file 'a' deletion
    Second time, it displays an error message:
    "svn: Working copy path 'b' does not exist in repository"

Is it not strange? I'm expecting that the second time, it should skip
file 'a', since it was already merged and now got nothing to merge. Even
if it does attempt, it makes sense if it display this error message:

  "svn: Working copy path 'a' does not exist in repository"

Because, the file 'a' does not exist in the branch-wc working copy. I'm
surprised to get a error message that file 'b' not exist in repository,
even though it does exist.

I'm quite unsure if anything is fundamentally wrong with the attached
script.

-- 
Regards,
Bhuvaneswaran

  • application/x-shellscript attachment: recipe.sh
Received on 2008-05-06 14:57:10 CEST

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