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

Spurious file deletions with reintegrate merge

From: Kamesh Jayachandran <kamesh_at_collab.net>
Date: Wed, 30 Jan 2008 21:30:33 +0530

Hi All,

I found one case where --reintegrate deletes a file where it should not.

a)Create a /trunk and /trunk/tfile.txt in r1.
b)copy /trunk /fb in r2
c)Add /fb/bfile.txt in r3
d)delete /trunk/tfile.txt in r4
e)merge /trunk to /fb and commit it in r5
f)add /trunk/tfile.txt in r6
g)merge /fb $trunk_wc --reintegrate

g) should only add 'bfile.txt'. But g) removes 'tfile.txt' and adds
'bfile.txt'.

With regards
Kamesh Jayachandran

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-01-30 17:00:08 CET

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