How to design for the following requirement

[Nirvan B]

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.


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.


Adrian Buehlmann wrote:
> 
> See also the command 'hg parents', which will show you the parent
> revisions of the working directory (two after a merge, only one
> otherwise).
> 

You are right. The command "hg parents" shows two parents, one with the new
features and other from the stable clone (bug fix).

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