How to design for the following requirement

[Martin Geisler]

Nirvan B <jatinkulkarni at yahoo.com> writes:

> Adrian Buehlmann wrote:
>>
>> BTW, the command
>>
>>    hg resolve --list
>>
>> will show you the 'resolved' state of the files that needed
>> to be merged.
>>
>
> The above command shows File2.java as Unresolved (U). But in reality
> it is already resolved as far as conflicts are concerned.

You must call 'hg resolve -m File2.java' to mark the file as resolved in
Mercurial's eyes. As long as it is listed as status U by 'hg resolve
-l', you wont be allowed to commit.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20090831/bbd1f08f/attachment.pgp