How to design for the following requirement

[Nirvan B]

Adrian Buehlmann wrote:
> 
> On 31.08.2009 15:14, Nirvan B wrote:
>> 
>> Adrian Buehlmann wrote:
>>> I think you now need to mark the files you manually resolved
>>> by using
>>>
>>>    hg resolve -m [FILE]
>>>
>>> See 'hg help resolve'. Then commit.
>>>
>>>
>>  
>> I used this command for the file which shows unresolved conflicts
>> (File2.java) . After that I tried to commit. But the commit still fails
>> with
>> the same message as before.
> 
> Obviously, there are *more* files that you should mark as
> resolved, no?
> 
> 'hg resolve --list' will tell you what these are.
> 
> Maybe you want to try using IRC channel #mercurial for more
> interactive help.
> 
> 
> 
> 
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
> 

Actually this is a known bug in NetBeans, which is the ide I am using

http://www.netbeans.org/issues/show_bug.cgi?id=165307
http://www.netbeans.org/issues/show_bug.cgi?id=165307 

Thanks for all the help.

regards,
nirvan.
-- 
View this message in context: http://www.nabble.com/How-to-design-for-the-following-requirement-tp25177298p25249363.html
Sent from the Mercurial mailing list archive at Nabble.com.