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

Re: Spurious file deletions with reintegrate merge

From: David Glasser <glasser_at_davidglasser.net>
Date: Wed, 30 Jan 2008 11:57:26 -0800

On Jan 30, 2008 11:48 AM, David Glasser <glasser_at_davidglasser.net> wrote:
> On Jan 30, 2008 9:55 AM, David Glasser <glasser_at_davidglasser.net> wrote:
> > On Jan 30, 2008 8:00 AM, Kamesh Jayachandran <kamesh_at_collab.net> wrote:
> > > 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'.
> >
> > Thanks for the catch, Kamesh. I attached a shell script that reproduces this.
> >
> > It looks like it's doing a
> >
> > $ svn merge $URL/trunk_at_3 $URL/branches/fb .
> > instead of
> > $ svn merge $URL/trunk_at_4 $URL/branches/fb .
>
> Worse, it's actually choosing trunk_at_6. Grr, that doesn't make any sense.

Looks like a bug in remove_irrelevant_ranges, which somehow manages to
*add* ranges. I'll fix after lunch.

--dave

-- 
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
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 20:57:40 CET

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