From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21399 invoked by alias); 5 Feb 2008 11:53:26 -0000 Received: (qmail 21372 invoked by uid 9112); 5 Feb 2008 11:53:26 -0000 Date: Tue, 05 Feb 2008 11:53:00 -0000 Message-ID: <20080205115326.21353.qmail@sourceware.org> From: mark@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Update importing new vendor branch changes instructions. X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7c08b13dc4b83fc468190c889ba3de2f7d8e83f7 X-Git-Newrev: 154edcc30cc41ec5a2bb973ea632351cb67603b5 Mailing-List: contact frysk-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: frysk-cvs-owner@sourceware.org Reply-To: frysk@sourceware.org X-SW-Source: 2008-q1/txt/msg00154.txt.bz2 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 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.

    -
  • Get the libunwind vendor branch - $ git-checkout vendor/LIBUNWIND -
  • Remove old stuff that needs to be replaced. - $ rm -rf frysk-import/libunwind +
  • Get the libunwind vendor branch.
    + $ git-branch vendor/LIBUNWIND origin/vendor/LIBUNWIND && git-checkout vendor/LIBUNWIND +
  • Remove old stuff that needs to be replaced.
    + $ rm -rf frysk-imports/libunwind
  • Get upstream stuff and put it in - (make sure you don't accidentially copy over the upstream .git dir) - $ cp -r ~/upstream/libunwind frysk-import/ + (make sure you don't accidentially copy over the upstream .git dir)
    + $ cp -r ~/upstream/libunwind frysk-imports/ && rm -rf frysk-imports/libunwind/.git +
  • Make sure all new files are added
    + $ git add frysk-imports/libunwind
  • Commit (use a commit messsage like "Import of libunwind version - libunwind-20071122") and push - $ git-commit -a && git-push + libunwind-20071122") and push
    + $ git-commit -a && git-push origin vendor/LIBUNWIND:vendor/LIBUNWIND

The vendor branch is now updated, now we merge the result to the trunk.

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