[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: Erik Huelsmann <e.huelsmann_at_gmx.net>
Date: 2006-03-15 23:25:24 CET

> --- 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.

bye,

Erik.

-- 
Echte DSL-Flatrate dauerhaft für 0,- Euro*!
"Feel free" mit GMX DSL! http://www.gmx.net/de/go/dsl
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 15 23:26:31 2006

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