On 27.01.2015 14:21, Lübbe Onken 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.
> 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...
Just in case the fresh checkout doesn't work, then you should report
this on the svn mailing list - I'm guessing that the check for mixed-rev
wc's could be wrong here in this situation.
Also, does it work if you check the box "force the merge" ?
I think that flag should ignore mixed-rev issues and just go on with the
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-01-27 21:58:24 CET