On 11.10.2009 09:18, Dadeo wrote:
> 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)"
I wouldn't have expected such an answer from Ben :)
Anyway, he told you to ask on the Subversion mailing list, not on the
TSVN mailing list because the svn mailing list is where the svn core
developers answer questions. They know a lot more about the internals of
the svn library than I do.
> 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
> Is the only solution to delete our Repository and create a new one?
I've checked out amped trunk and the 3.1 branch. Then I did a merge:
Merging revisions 710-742 of
D:\Development\SVN\SVNTests\amped\skin, respecting ancestry
with D:\Development\SVN\SVNTests\amped being a wc of the amped trunk.
The merge took 3 minutes and 19 seconds - nowhere near the 20 minutes
I would therefore suspect either a problem with your internet connection
or maybe a broken working copy (which could be fixed with a fresh
checkout). Also, there might be a virus scanner which slows down the
data transfer too much.
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 2009-10-11 09:56:53 CEST