public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Added documentation on importing a third party package
@ 2007-11-23 17:50 moore
  0 siblings, 0 replies; only message in thread
From: moore @ 2007-11-23 17:50 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  8c320cb2580d3ba842778c46afa7ce04017ab92a (commit)
      from  4d94f9bf96e6adf1d8e96afe84523e6359f9dc55 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 8c320cb2580d3ba842778c46afa7ce04017ab92a
Author: Tim Moore <moore@blackbox.bricoworks.com>
Date:   Fri Nov 23 18:50:16 2007 +0100

    Added documentation on importing a third party package

-----------------------------------------------------------------------

Summary of changes:
 htdocs/build/index.html |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

First 500 lines of diff:
diff --git a/htdocs/build/index.html b/htdocs/build/index.html
index f7d7778..29cad3a 100644
--- a/htdocs/build/index.html
+++ b/htdocs/build/index.html
@@ -428,6 +428,40 @@ $ cvs -d :ext:MYNAME@sourceware.org:/cvs/frysk \
 </ul>
 </dd>
 
+<dt>How do I import a third party package into frysk-imports?</dt>
+<dd>Checkout a branch for the imported package only. Future updates to
+  the package will be made on this branch. You do this by checking out
+  the first revision of Frysk, which was empty, 
+  then add and commit the <code>frysk-imports</code> directory and the
+package. After that you checkout the Frysk <code>master</code> branch
+and merge in the branch with the packge.
+
+<p>Example:
+<pre>
+$ git-checkout -b vendor/LIBFOO genesis<b>(1)</b>
+$ mkdir frysk-imports
+$ tar xf libfoo.tar -C frysk-imports
+$ git-add frysk-imports<b>(2)</b>
+$ git-commit -m"Initial import of libfoo"
+$ git-checkout master<b>(3)</b>
+$ git-merge vendor/LIBFOO<b>(4)</b>
+$ git-push origin master vendor/LIBFOO:vendor/LIBFOO<b>(5)</b>
+</pre></p>
+<ol>
+  <li><p>Checkout the first revision of Frysk, which we've tagged with
+  the tag <tt>genesis</tt>. with the <tt>-b</tt> flag we create a new
+  branch for the checkout. All our 3rd party import branches have a
+  prefix of <tt>vendor/</tt> and then the name of the package in
+  uppercase.</p>
+  <li><p>Adding a directory recursively adds its contents.</p>
+  <li><p>Switch back to the master branch</p>
+  <li><p>The merge creates <tt>libfoo</tt> and its contents on the
+  master branch.</p>
+  <li><p>Push the imported changes to the master branch in the remote
+  repository,and also create a new remote branch for the import in the
+  remote repo.</p>
+</ol>
+
 <dt>How do I update a third party package in frysk-imports?</dt>
 <dd>This assumes that there is already a vendor branch in git for
 the package under <code>frysk-imports</code>.


hooks/post-receive
--
frysk system monitor/debugger


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2007-11-23 17:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-23 17:50 [SCM] master: Added documentation on importing a third party package moore

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).