RE: [Xen-ia64-devel] RE: [PATCH] Patch to make latest hg multi-domainback to work

["Magenheimer, Dan (HP Labs Fort Collins)" <dan.magenheimer@xxxxxx>]

Done.  Thanks much for the instructions.

Did this (two heads) happen because I pushed from
two different directories? 

> -----Original Message-----
> From: Yang, Fred [mailto:fred.yang@xxxxxxxxx] 
> Sent: Friday, September 02, 2005 12:00 PM
> To: Magenheimer, Dan (HP Labs Fort Collins); Tian, Kevin; 
> Byrne, John (HP Labs)
> Cc: xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> Subject: RE: [Xen-ia64-devel] RE: [PATCH] Patch to make 
> latest hg multi-domainback to work
> 
> Try do the following
> 
> [fred]$ hg clone http://xenbits.xensource.com/ext/xen-ia64-unstable.hg
> [fred]$ hg heads
> changeset:   5982:a6bb479191613810dd22974219198f24e0935c4e
> tag:         tip
> parent:      5978:c56a9805216a23c014d91d213a7a0962566b76fc
> user:        fred@xxxxxxxxxxxxxxxxxxxxx
> date:        Fri Aug 12 16:08:58 2005
> summary:     Replace Xen_regs with cpu_users_regs to match upstream
> 
> changeset:   5981:fd61ce502c71261e84818b373c9c39dd1c84dbc3
> user:        ydong@xxxxxxxxxxxxxxxxxxxxx
> date:        Sun Aug 14 23:52:20 2005
> summary:     Removing KR to PER CPU memory.
> 
> [fred]$ hg co -C 6458
> [fred]$ hg co -m 6459
> [fred]$ hg co -m
> changeset:   6461:68d8a0a1aeb7240b27e0e2ecea4c39d0e47fcb31
> tag:         tip
> user:        djm@xxxxxxxxxxxxxxx
> date:        Thu Sep  1 14:51:57 2005
> summary:     Kevin and John's update to latest xen-unstable 
> for multiple
> domain - xen part
> 
> changeset:   6459:888877bc3d798a0f756a01a45caf2d9b2ada0138
> user:        djm@xxxxxxxxxxxxxxx
> date:        Thu Sep  1 12:01:55 2005
> summary:     Fix instructions and remove obsolete mkbuildtree
> [fred]$ hg heads
> [fred]$ hg ci
> [fred]$ hg heads
> changeset:   6462:1537bdbf2b3ac446b0dbec33b3391fcd382c8746
> tag:         tip
> parent:      6459:888877bc3d798a0f756a01a45caf2d9b2ada0138
> parent:      6461:68d8a0a1aeb7240b27e0e2ecea4c39d0e47fcb31
> user:        fred@xxxxxxxxxxxxxxxxxxxxx
> date:        Fri Sep  2 11:10:37 2005
> summary:    merging testing
> 
> Magenheimer, Dan (HP Labs Fort Collins) wrote:
> >> BTW, Dan, there's two heads on current xen-ia64-unstable.hg. Please
> >> do a merge.
> > 
> > Hmm... can someone explain to me what this means, what
> > I might have done to cause it, what problems it causes
> > for developers, what I do to fix it, and how I avoid
> > it happening again?
> > 
> > This happened before but Arun fixed it.  (And,
> > speaking of Arun, now that he is "unavailable",
> > do we have any hg experts on the xen-ia64-devel
> > list or should I post these questions to xen-devel?)
> > 
> > Dan
> > 
> > _______________________________________________
> > Xen-ia64-devel mailing list
> > Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> > http://lists.xensource.com/xen-ia64-devel
> 
> 

_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel