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

Re: Unusable working copy after add/rm/add/merge

From: Ivan Zhakov <chemodax_at_gmail.com>
Date: 2006-03-16 10:58:04 CET

On 3/16/06, Erik Huelsmann <e.huelsmann@gmx.net> wrote:
> > --- Urspr√ľngliche Nachricht ---
> > Von: "Garrett Rooney" <rooneg@electricjellyfish.net>
> > An: "Simon Large" <simon@skirridsystems.co.uk>, "Subversion Dev List"
> > <dev@subversion.tigris.org>
> > Betreff: Re: Unusable working copy after add/rm/add/merge
> > Datum: Tue, 14 Mar 2006 15:05:29 -0800
> >
> > On 3/14/06, Simon Large <simon@skirridsystems.co.uk> wrote:
> > > Garrett Rooney wrote:
> > > > On 3/10/06, Simon Large <simon@skirridsystems.co.uk> wrote:
> > > >> Hi folks,
> > > >>
> > > >> This was reported on the TSVN list today.
> > > >> Add file and commit
> > > >> Delete file and commit
> > > >> Add same filename again and commit.
> > > >> Merge -r3:1 to revert to original file.
> > > >> WC is terminally broken.
> > > >>
> > > >> It's a bit contrived, but it shouldn't break the WC.
> > > >
> > > > Interestingly, if you insert an 'svn up' after the final 'svn ci' and
> > > > before the 'svn merge' it works fine. Must be something screwy in the
> > > > working copy code I guess.
> > >
> > > Any further comment on this? Should I file an issue?
> >
> > Yes, please do. I'm hoping to get a chance to look into it more
> > closely, but I don't know when I'll find the time.
>
> Were you using recent trunk?
>
> Exactly this should have been fixed by the wc-replacements update last
> autumn.
>
Hm, using trunk:

C:\tmp\mergebug>svn co file:///c:/tmp/mergebug/repos wc
Checked out revision 0.

C:\tmp\mergebug>echo TestA 1>wc\TestA.txt

C:\tmp\mergebug>svn add wc\TestA.txt
A wc\TestA.txt

C:\tmp\mergebug>svn ci -m "r1" wc
Adding wc\TestA.txt
Transmitting file data .
Committed revision 1.

C:\tmp\mergebug>svn rm wc\TestA.txt
D wc\TestA.txt

C:\tmp\mergebug>svn ci -m "r2" wc
Deleting wc\TestA.txt

Committed revision 2.

C:\tmp\mergebug>echo TestA2 1>wc\TestA.txt

C:\tmp\mergebug>svn add wc\TestA.txt
A wc\TestA.txt

C:\tmp\mergebug>svn ci -m "r3" wc
Adding wc\TestA.txt
Transmitting file data .
Committed revision 3.

C:\tmp\mergebug>svn merge -r3:1 wc wc
D wc\TestA.txt
A wc\TestA.txt

C:\tmp\mergebug>svn up wc
svn: Failed to add file 'wc\TestA.txt': object of the same name already exists

C:\tmp\mergebug>svn up wc
svn: Working copy path 'TestA.txt' does not exist in repository

C:\tmp\mergebug>pause

--
Ivan Zhakov
Received on Thu Mar 16 10:58:39 2006

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