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

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

From: Ben Fritz <fritzophrenic_at_gmail.com>
Date: Wed, 28 Jan 2015 09:40:38 -0600

On Tue, Jan 27, 2015 at 7:21 AM, Lübbe Onken <luebbe.tortoisesvn_at_gmail.com>
> 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
> [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

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.


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-28 16:41:09 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.