I've encountered a situation, where it appears to be impossible to
resolve a tree conflict such that it results in the desired outcome.
I think it will be easiest for me to explain with an example (I
suspect that much of the following is not relevant information, but
I'm including it in case its):
The server is running SVN 1.4.6 (so we're not using merge tracking).
My client is currently TSVN 1.6.10 (I also use the 1.6.12 CLI client
from collabnet for some things).
The following describes the branch setup prior to the problematic scenario:
I have a Branch "A" that has existed for a long time.
Branch "B" was created from Branch "A".
Various unrelated commits were made in Branch "B" over the course of
several months and these were merged back to Branch "A"
Branch "C" was created from Branch "B"
Now for the specifics of the problematic scenario:
1. A new file, "Test.java" was added and committed to an existing
directory in Branch "A".
2. The revision in which "Test.java" was committed was merged to Branch "C".
3. All changes in Branch "C" were manually merged to Branch "B" (no
additional changes to "Test.java" were made in Branch "C").
4. Several text change commits were made to to "Test.java" in Branch "B".
5. All changes in Branch "B" that weren't previously merged were
merged to Branch "A" (into a pristine working copy).
6. "Test.java" now has a tree conflict.
So far, everything seems fine, I understand why there is a tree
conflict, and that is correct.
The problem occurs when I try to resolve the tree conflict. Using the
"Edit Conflicts" TSVN action produces a dialog that says "The last
merge operation tried to add the file "Test.java", but it was already
added locally" with two possible actions, "Keep the file from the
repository" and "Keep the local file". It doesn't seem to matter
which of the actions I choose - the resulting "Test.java" in the
working copy doesn't contain the changes that were made in "Step 4"
Am I missing something or doing something wrong?
Any suggestions on what I can do to get my merge to work correctly?
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-02 16:21:57 CEST