I'm having some issues with the new Merge Wizzard. Since its been
introduced I have been unable to merge from two unconnected trees (ie
imported external code) with ignore ancestry set (also I have tried with
connected tree's, ie feature branch from trunk).
I just keep getting errors warning me that '.' is not a working copy. I
can't see what I might have done wrong.
The operation that I am trying to perform works fine with the latest
official release (1.4.5). I first spotted the problem in the nightly
builds some days ago (I think it was r11081). But I upgraded my version
to the latest nightly build (r11278) and the problem still exists.
I have attached some screen captures showing exactly which options were
selected during the process. I can confirm that I had got to the merge
wizzard by right clicking on a valid (freshly checked out) working copy
and selecting merge.
What I am basically attempting to achieved is merging the changes
between rc1 and rc2 for the latest dev version of mantis into my local
trunk which includes of my own modifications. I know there are other
ways of managing such a task, but this is the one I had chosen and had
previously been happy with.
Any one have any ideas?
Ta
Adam
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 7 21:21:49 2007