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

Norbert Unterberg wrote:
> 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:
>
[snip]
> How do I tell TSVN that the conflict is resolved? The "Resolved" menu
> entry is not available in the context menu.

If the menu isn't available, all it takes to remove the 'conflicted'
status is to remove the created files, i.e. test.c.working,
test.c.merge-right.rX, ...

> 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.

If you could create a reproduction recipe with the CL client, I think
you should post that to the Subversion dev list then!

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org