Re: [PATCH] Additional XFail test to prove issue #2897

Hi Kamesh,

Kamesh Jayachandran wrote:
> Points to cleanup,
> In this patch we keep creating different expected_status from
> 'get_virginal_state', we need to reuse them, probably in other 2
> testcases too.

Committed in r28581 for merge test 79 only. I shall do it for the other 2 test
cases.

> We need to extend this conflict scenario to have conflict resolution to
> be changing few other lines like modifying 'line1' along with addressing
> exactly one line of conflict.

I shall work on this.

-- 
Senthil Kumaran S
http://www.stylesen.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org