On Wed, 2005-06-22 at 09:33 -0600, Li-Ta Lo wrote: > On Wed, 2005-06-22 at 03:50 -0600, Eric W. Biederman wrote: > > Ok. After I finally developed a sane common ancestor between > > the two trees it did not take much time to finish the merge. > > > > >From that ancestor [EMAIL PROTECTED]/frebios--devel--2.0--base-0 > > I have merged each patch individually with star-merge and that worked > > well allowing me to fix the small handful of conflicts that the new > > development created. > > > > I would love to move the changes into the public tree the same way but it > > does > > not appear easily possible, instead it is trivial to simply merge my entire > > tree into the public tree. > > > > Since I want to avoid breaking things by acting too hastily I have > > performed the merge and placed the code in the branch: > > [EMAIL PROTECTED]/freebios--lnxi--1--patch-1 > > > > > > How am I going to check out that branch? > > [EMAIL PROTECTED] tmp]$ tla get [EMAIL PROTECTED]/freebios-- > lxni--1 freebios_lxni > No such package (freebios--lxni) > name: [EMAIL PROTECTED] > location: > sftp://[EMAIL PROTECTED]/srv/arch/[EMAIL PROTECTED] > package-version: freebios--lxni--1 > > Do I have to "tla register archive" or something? >
Sorry, it a typo. -- Li-Ta Lo <[EMAIL PROTECTED]> Los Alamos National Lab _______________________________________________ LinuxBIOS mailing list [email protected] http://www.openbios.org/mailman/listinfo/linuxbios
