On Thu, May 22, 2008 at 10:20 AM, Mark Johnson <[EMAIL PROTECTED]> wrote: > > ** You *may* need to merge .hgignore at this point.. > if you do, it should be the following after the merge. > -- > syntax: glob > status > guards > >
Hi Mark, I am following this instruction to build my xen-unstable bits. Can you tell me how to merge .hgignore as you stated here? Which command do I need to execute? My "hg qpush -a" in xen.hg will fail. I am not sure whether it is due to the skip of this step. [EMAIL PROTECTED]:xen.hg]hg qpush -a applying xen-naming applying tools-compile-fixes applying pty-fixes applying backtrace applying libaio applying blktap applying allow-legacy-hypercall applying msrs-solaris applying hvm-fixes applying solaris-ioemu-tap applying solaris-panic-support applying no-linux-specifica patching file tools/python/xen/xm/main.py Hunk #1 FAILED at 142 1 out of 12 hunks FAILED -- saving rejects to file tools/python/xen/xm/main.py.rej patch failed, unable to continue (try -v) patch failed, rejects left in working dir Errors during apply, please fix and refresh no-linux-specifica _______________________________________________ xen-discuss mailing list [email protected]
