From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path:
Received: (qmail 24103 invoked by alias); 5 Feb 2008 21:32:52 -0000
Received: (qmail 24038 invoked by uid 9112); 5 Feb 2008 21:32:51 -0000
Date: Tue, 05 Feb 2008 21:32:00 -0000
Message-ID: <20080205213251.24022.qmail@sourceware.org>
From: mark@sourceware.org
To: frysk-cvs@sourceware.org
Subject: [SCM] master: Update vendor branch merge to trunk instructions.
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5aeecb313a635e3523458519d0a741b36edd7fdc
X-Git-Newrev: 8b7aab0ff7f664b99bd1ce16541a92b6b7cee8e2
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/msg00156.txt.bz2
The branch, master has been updated
via 8b7aab0ff7f664b99bd1ce16541a92b6b7cee8e2 (commit)
from 5aeecb313a635e3523458519d0a741b36edd7fdc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 8b7aab0ff7f664b99bd1ce16541a92b6b7cee8e2
Author: Mark Wielaard
Date: Tue Feb 5 22:28:29 2008 +0100
Update vendor branch merge to trunk instructions.
-----------------------------------------------------------------------
Summary of changes:
htdocs/build/index.html | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
First 500 lines of diff:
diff --git a/htdocs/build/index.html b/htdocs/build/index.html
index f4111ac..3a4a9dd 100644
--- a/htdocs/build/index.html
+++ b/htdocs/build/index.html
@@ -504,20 +504,27 @@ to trunk.
The vendor branch is now updated, now we merge the result to the trunk.
-- Switch to trunk
-
$ git-checkout master
- - Merge new vendor branch to the trunk
+
- Switch to trunk
+ $ git-checkout master
+ - Merge new vendor branch to the trunk
$ git-merge vendor/LIBUNWIND
- Resolve the conflicts using
git-rm
for files not needed,
editing files with conflict markers and git-add
each one
- after resolving the issues.
- - Do a full clean build and double check the test results.
+ after resolving the issues (if you fix a file more than once, you
+ have to
git-add
it after each change. Keep an eye on
+ git-status
to spot any modified, but not added changes).
+ - Do a full clean build and double check the test results.
[.. lots of time passes...]
- Double check your patches (all should now be staged in the git index)
- with
git-diff --cached
+ with
+ git-diff --cached
- Commit and push the result (git will have generated a merge message
- for you already that you can use in the commit).
-
$ got commit &&; git push
+ for you already that you can use in the commit).
+ $ git-commit && git-push
+ If the push fails because other commits have been done DON'T
+ try to rebase, this will horribly fail!. Use git-merge
+ $ git-fetch origin && git-merge origin
+ Double check the merge went OK and only then git-push
.
If too much time has passed since the start the push will fail because
hooks/post-receive
--
frysk system monitor/debugger