[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: Lübbe Onken <luebbe.tortoisesvn_at_gmail.com>
Date: Wed, 28 Jan 2015 08:24:32 +0100

Hi Stefan,

you wrote:

2015-01-27 21:58 GMT+01:00 Stefan Küng <tortoisesvn_at_gmail.com>:

> 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"
> >...
> >
> > 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.

seems so. The interesting thing is that this particular change originally
was done on trunk. And only trunk working copies who already have this
change and pull in changes from somewhere else are affected. Branch working
copies who pull in this change from trunk are not affected. (We're talking
about two out of ten developers right now).

> 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
> merge.

Ah, ok, I didn't even think of trying that option. Thanks for the

My solution was to copy an existing WC in windows explorer and switch it to
trunk. This was faster than a fresh checkout.

Switching the "screwed up" trunk wc to a different branch and back didn't
help. Up to now, the problem hit a colleague and me, exactly those two
people who do a lot of reintegration work. Maybe our trunk working copies
were getting old in a way, even though we clean them up before each
reintegration step. It could probably also happen to others, so I'll keep
the "force merge" option in mind.

- 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-28 08:24:44 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.