[TSVN] Problem: Can not resolve added file with conflict

I had a very intersting situation today that I could only resolve with
the help of the command line client:

I had created a test-branch from trunk, and then merged individual
revisions from a different branch (feature branch) into this test
branch. During this process the following happened:

1. merge revision X into test-branch:
    File test.c was added

2. Manually edit test.c

3. merge revision Y into test-branch:
    File test.c is in conflict,
    files test.c.working, test.c.merge-right.rX etc. appeared

4. Manually edit and resolve the conflict in the test.c file with a text
editor.

5. The overlay still shows the "added" icon.

Hmm, how do I commit my changes?

6. I try to commit:
    Error: "test.c" is still in conflict

How do I tell TSVN that the conflict is resolved? The "Resolved" menu
entry is not available in the context menu.

So I tried the command line client:

>svn st
? test.c.merge-right.r294
? test.c.working
? test.c.merge-left.r293
A + test.c

Hmm, no conflict marker.

>svn resolved test.c
Konflikt von 'test.c' aufgelöst

After this operation, the commit worked in TSVN.

The file test.c was not shown as conflicted, not in the commit dialog
nor in the check for modification dialog. I think there is a "leak",
maybe the resolved menu entry needs to be shown also for added files?
Even the command line client did not show the file as conflicted, but at
least it let me resolve it.

Norbert

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed May 4 16:10:19 2005