Hi
You're not really making sense, but I would recommend that you leave your
working copy alone for now.
Make a new checkout that will get you latest in trunk.
Merge back to the revision you wanted and commit..
Now you should be back where you were before you messed up.
Then ask us for help on what you tried to achieve in the beginning, maybe
there's a better way to do it ;-)
Cheers / Erik
On Wed, Aug 18, 2010 at 3:13 PM, Steven Koch <stvkoch_at_gmail.com> wrote:
> But I know'n making it!!
>
> :(
>
> On Aug 18, 2:07 pm, Steven Koch <stvk..._at_gmail.com> wrote:
> > Hi,
> >
> > I need update the servers, and continue send changes to the point
> > 3243! but actual content of SVN server are different (now r3251 is
> > considered new files, same that they are equals files)
> >
> > We have two servers(stagging and production), one development machine
> > and one repository SVN server separated.
> >
> > SVN server considerate all files how new. And when try update server
> > stagging teel me:
> > - 'svn: Failed to add directory 'libDirectory': object of the same
> > name already exists'
> >
> > My revision in local copy is 3243 but in SVN server 3251
> >
> > I think that solution is rollback the same revision of the servers
> > (stagging and production) and later apply the changes in content and
> > update servers(stagging and production)!
> >
> > But I can rollback in my local copy to r3243 but not can commit this
> > revision or point!
> >
> > On Aug 18, 1:42 pm, Giulio Troccoli <Giulio.Trocc..._at_uk.linedata.com>
> > wrote:
> >
> > > > Thnks
> >
> > > > But, I can rolback the revision on my working copy (NOW my
> > > > working copy are 3243, and the SVN 3251), but not can commit
> > > > this 'rollback'
> > > > to trunk! because this revision already exists on SVN Server
> >
> > > If you have reverse-merge the offending revisions than your working
> copy is at revision 3251. Can you tell us *exactly* what commands did you
> use?
> >
> > > G
> >
> > > Linedata Limited
> > > Registered Office: 85 Gracechurch St., London, EC3V 0AA
> > > Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
> >
> >
>
Received on 2010-08-18 15:35:24 CEST