RE: Strange new problem with tree conflicts
From: Jeff Simon <jas_at_rephunter.net>
Date: Thu, 10 Sep 2009 22:53:57 -0700 (PDT)
As you suspected, much of what you are suggesting does not apply.
However, the part about "delete/copy" might be related.
I have been using TSVN with SVN for a bit over two years. For all of the early part of that work, when there was only one or two file changes that needed to be merged, I would just copy from one working copy directly to the other.
While this is not a two-step delete followed by copy, it may have the same effect.
Is this previously workable procedure now causing this problem?
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
|
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.