On Mon, Jul 27, 2009 at 08:25:27AM -0700, Sangeeta Misra wrote:
> >>After the hg merge, I did a hg commit with the single comment "sync
> >>with onnv_120" I then realised a flaw in the merge in one of the
> >>files, fixed it, and did a hg commit. At this point I see all the
> >>sccs comments from hg tags of 112- - 119 _+ the comment "sync with
> >>onnv_120" Should I remove these ( and just have "sync with
> >>onnv_120") , or leave these in?
> >
> >Where do you see these comments, and why do you think they might be
> >problematic?
>
> I see it when I do "hg commit" after manually fixing a merge flaw.
They're presented to you in the comment editor that "hg commit" gives you?
And you hadn't seen those comments before? If you didn't add them, then
they were already there. If you run
hg --config extensions.hgext.graphlog glog
do you see your branch as well as the gate branch, your merge changeset,
and the fix you put on top of the merge? Which changeset are the "bad"
comments associated with?
Danek
_______________________________________________
tools-discuss mailing list
tools-discuss@opensolaris.org
