How to design for the following requirement

[Adrian Buehlmann]

On 28.08.2009 23:32, Nirvan B wrote:
> Adrian,
>       Thanks for the reply. I did as you said. I pulled from the stable
> (clone) and merged. Merge created some conflict and I resolved them. I can
> see the changes from stable into main. But, when I try to commit main, I get
> error "abort: unresolved merge conflicts (see hg resolve)". This is
> contradictory, since I have already resolved all conflicts. I used "Hg
> status" and it shows two files modified "M". What am I missing now ?
> 
> Here is the glog for main repository - 
> 
> @  changeset:   3:0fd8c7c11dad
> |  tag:         tip
> |  parent:      1:3bf7c089edac
> |  user:        Jatin at SERVER
> |  date:        Sat Aug 29 02:21:47 2009 +0530
> |  summary:     BugFix : IS-2
> |
> | @  changeset:   2:50dd61812bb6
> |/   user:        Jatin at SERVER
> |    date:        Sat Aug 29 02:22:18 2009 +0530
> |    summary:     New Feature : Feature 1
> |
> o  changeset:   1:3bf7c089edac
> |  user:        Jatin at SERVER
> |  date:        Sat Aug 29 01:46:18 2009 +0530
> |  summary:     BugFix : IS-1
> |
> o  changeset:   0:4de788e18703
>    user:        Jatin at SERVER
>    date:        Sat Aug 29 01:41:08 2009 +0530
>    summary:     Initial Version 1_0
> 

I think you now need to mark the files you manually resolved
by using

   hg resolve -m [FILE]

See 'hg help resolve'. Then commit.

BTW, the command

   hg resolve --list

will show you the 'resolved' state of the files that needed
to be merged.

BTW, in the glog picture above, you see two changesets marked
with '@': This means that your working directory [1] is now based on
two changesets -- this is what you get after a merge, right before
the commit of the merge.

'@' marks the parent revision(s) of the working directory.

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

[1] http://mercurial.selenic.com/wiki/WorkingDirectory