[SCM] master: Update importing new vendor branch changes instructions.

[mark@sourceware.org]

The branch, master has been updated
       via  154edcc30cc41ec5a2bb973ea632351cb67603b5 (commit)
      from  7c08b13dc4b83fc468190c889ba3de2f7d8e83f7 (commit)

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

- Log -----------------------------------------------------------------
commit 154edcc30cc41ec5a2bb973ea632351cb67603b5
Author: Mark Wielaard <mwielaard@redhat.com>
Date:   Tue Feb 5 12:53:00 2008 +0100

    Update importing new vendor branch changes instructions.

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

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

First 500 lines of diff:
diff --git a/htdocs/build/index.html b/htdocs/build/index.html
index bd9a383..f4111ac 100644
--- a/htdocs/build/index.html
+++ b/htdocs/build/index.html
@@ -487,16 +487,18 @@ by putting it on the frysk vendor branch in git and then merging it
 to trunk.</p>
 
 <ul>
-<li> Get the libunwind vendor branch
-     <code>$ git-checkout vendor/LIBUNWIND</code>
-<li> Remove old stuff that needs to be replaced.
-     <code>$ rm -rf frysk-import/libunwind</code>
+<li> Get the libunwind vendor branch. <br>
+     <code>$  git-branch vendor/LIBUNWIND origin/vendor/LIBUNWIND && git-checkout vendor/LIBUNWIND</code>
+<li> Remove old stuff that needs to be replaced. <br>
+     <code>$ rm -rf frysk-imports/libunwind </code>
 <li> Get upstream stuff and put it in
-     (make sure you don't accidentially copy over the upstream .git dir)
-     <code>$ cp -r ~/upstream/libunwind frysk-import/
+     (make sure you don't accidentially copy over the upstream .git dir) <br>
+     <code>$ cp -r ~/upstream/libunwind frysk-imports/ && rm -rf frysk-imports/libunwind/.git </code>
+<li> Make sure all new files are added <br>
+     <code>$ git add frysk-imports/libunwind </code>
 <li> Commit (use a commit messsage like "Import of libunwind version
-     libunwind-20071122") and push
-     <code>$ git-commit -a && git-push</code>
+     libunwind-20071122") and push <br>
+     <code>$ git-commit -a && git-push origin vendor/LIBUNWIND:vendor/LIBUNWIND </code>
 </ul>
 
 <p>The vendor branch is now updated, now we merge the result to the trunk.</p>


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