Re: Problem merging with mixed revisions although no mixed revisions exist

Hi Ben,

2015-01-28 16:40 GMT+01:00 Ben Fritz <fritzophrenic_at_gmail.com>:

>
>
> On Tue, Jan 27, 2015 at 7:21 AM, Lübbe Onken <luebbe.tortoisesvn_at_gmail.com>
> wrote:
> >
> > Hi Folks,
> >
> > I'm trying to reintegrate a developer branch into trunk, but the merge
> fails with the following message
> >
> > "Kann nicht in eine Arbeitskopie mit verschiedenen Revisionen
> zusammenführen
> > [3797:20323], versuchen Sie erst zu aktualisieren"
> >
> > "Can not merge in a working copy with mixed revisions
> > [3797:20323], try to update first"
> >
> > The (not so) funny thing is that the working copy doesn't contain mixed
> revisions and it is fully updated.
> >
> > But (there's always a but :)) the lower revision of the shown range is
> the revision of an external that points to a fixed revision (@3797) in a
> different repository.
> > This external is an "in place" replacement of a folder that used to be
> part of the original repository, but that has now been moved to an external
> repository.
> >
>
> I have never seen this, so I have no idea whether it will work, but I'd
> try using "Update to revision" on trunk to get to the change where your
> folder was replaced by an external, and then doing another update after
> that, to see if you can un-confuse SVN. Then do your merge.
>

Would be worth a try, but IIRC, my colleague did it that way and he had
exactly the same problem. I deleted the replaced folder and ran update
after that.

Cheers
- Lübbe

--
Please help me get more space on Dropbox :)
https://www.dropbox.com/referrals/NTIwMzcxNjI5
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3095186
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].