Re: Merging Branch to Trunk takes 20 min for one change

Thanks for clarifying that Stefan:
"If however you always merge from your /skin folder, then you should
keep doing that."
I would love to keep doing that, if I could get it to work!!!

I did contact Google and they said it is not a problem with Google
Code Project Hosting and suggested I contact you! LOL It's good I
still have my sense of humour! BTW we do not use Mercurial although
they suggested, as a last resort, we should "hand-assemble a new tree
that has all the changes you want (manually mixed together), and then
switch to mercurial (starting with a clean history)"

Obviously, I am hoping for a better solution that would require less
work. So, I am just asking for your expert opinion on how I should
repair our project. I tried creating a new branch, committed some of
my changes to it, and merging that revision to /trunk, but it resulted
in the same problem where all versioned files show modified
properties.

Is the only solution to delete our Repository and create a new one?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2406309

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-10-11 09:19:00 CEST