[svk-users] svk pull/push to resolve conflict

[Brice Figureau]

On Wed, November 14, 2007 02:27, Wing Choi wrote:
> [snipped]
> He does that and ends up with the updated merges
> in his local copy and in the checked out area.
> The file is now:
>
> user 1 and 2 This is a line in the file.
>
> But when he svk pushes now, he gets the following
> conflict to resolve:
>
>>>>> YOUR VERSION myfile (/mirror/trunk) 119500223876912
> user 2 This is a line in the file.
> ==== ORIGINAL VERSION myfile 119500223876912
> This is a line in the file.
> ==== THEIR VERSION myfile (/u1l/trunk) 119500223876912
> user 1 This is a line in the file.
> <<<< 119500223876912

This seems suspect as the "your version" should contain the resolved
version (ie. user 1 and 2 thing).

> What gives?  What happened with the local copy merged
> stuff and why resolve a conflict at all...

What gives svk status ?
Do you still have any conflict ?
If yes you might have to svk resolved and svk commit the change before
pushing.

-- 
Brice Figureau
Days of Wonder