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

Problem merging with mixed revisions although no mixed revisions exist

From: Lübbe Onken <luebbe.tortoisesvn_at_gmail.com>
Date: Tue, 27 Jan 2015 14:21:09 +0100

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

Updating trunk, commiting, everything works fine, same on the developer
branch, which already has the change with the "in place" replaced folder.
Merging anything into the developer branch also works fine.
To me It looks like my trunk working copy is screwed up in a way.
No cleanup, update, revert helped me to solve this problem. Has anybody
else encountered something similar? Any suggestions how to solve this? I
know I can nuke my working copy and do a fresh checkout, but since this
takes ~1 hour, I'm reluctant to do this.

Suggestions welcome...

- Lübbe

Please help me get more space on Dropbox :)
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net  PGP Key ID 0x23F511AB
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-27 14:21:17 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.