On 07/27/09 09:58, Richard Lowe wrote:
Sangeeta Misra writes:
Ah I may have done this
hg merge
do file merge
hg commit with the comment "sync with onnv_120"
hg recommit < I dont think I should do this
did a nightly which found a faw in merge in file a
edited the file a
did hg commit
Sangeeta Misra writes:
> Ah I may have done this
>
> hg merge
> do file merge
> hg commit with the comment "sync with onnv_120"
> hg recommit < I dont think I should do this
> did a nightly which found a faw in merge in file a
> edited the file a
> did hg commit
> <--- now I see a whole bun
On 07/27/09 08:50, Richard Lowe wrote:
Sangeeta Misra writes:
On 07/27/09 08:38, Danek Duvall wrote:
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 t
Sangeeta Misra writes:
> On 07/27/09 08:38, Danek Duvall wrote:
>
> 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
On 07/27/09 08:38, Danek Duvall wrote:
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 s
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
On 07/27/09 08:23, Danek Duvall wrote:
On Mon, Jul 27, 2009 at 08:17:38AM -0700, Sangeeta Misra wrote:
I am working on merging the opensolaris ILB project gate to
onnv_120. and followed the methadology listed in "Running a project"
section of
http://www.opensolaris.org/os/community/tools/sc
On Mon, Jul 27, 2009 at 08:17:38AM -0700, Sangeeta Misra wrote:
> I am working on merging the opensolaris ILB project gate to
> onnv_120. and followed the methadology listed in "Running a project"
> section of
> http://www.opensolaris.org/os/community/tools/scm/hg_teamware_transition/hg_workflow/
