<html xmlns="http://www.w3.org/1999/xhtml"
lang="en" xml:lang="en">
<head>
-<div style="text-align:right;font-size:70%;white-space:nowrap;">
- <a accesskey="h" href="http://www.debian.org/"> UP </a>
- |
- <a accesskey="H" href="http://wiki.debian.org/Teams/Policy"> HOME </a>
-</div>
-
<title>Debian Policy</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="generator" content="Org-mode"/>
-<meta name="generated" content="2009-09-15 15:48:45 CDT"/>
+<meta name="generated" content="2010-06-04 09:42:57 PDT"/>
<meta name="author" content="Manoj Srivastava And Russ Allbery"/>
<meta name="description" content=""/>
<meta name="keywords" content=""/>
font-weight:bold; }
body {
- color: DarkSlateGrey;
- background-color: gainsboro;
+ color: black;
+ background-color: white;
font-family: Palatino, "Palatino Linotype", "Hoefler Text", "Times New Roman", Times, Georgia, Utopia, serif;
}
.org-agenda-date { color: #87cefa; }
font-weight: bold;
}
- a {
- color: inherit;
- background-color: inherit;
- font: inherit;
- text-decoration: inherit;
- }
a:hover { text-decoration: underline; }
.todo { font-weight:bold; }
.done { font-weight:bold; }
</head>
<body>
<div id="content">
+<div id="org-div-home-and-up" style="text-align:right;font-size:70%;white-space:nowrap;">
+ <a accesskey="h" href="http://www.debian.org/"> UP </a>
+ |
+ <a accesskey="H" href="http://wiki.debian.org/Teams/Policy"> HOME </a>
+</div>
+
<h1 class="title">Debian Policy</h1>
</div>
-<div id="outline-container-1.1" class="outline-3">
-<h3 id="sec-1.1">Interacting with the team </h3>
-<div class="outline-text-3" id="text-1.1">
+<div id="outline-container-1_1" class="outline-3">
+<h3 id="sec-1_1">Interacting with the team </h3>
+<div class="outline-text-3" id="text-1_1">
<ul>
git checkout master
git pull
-# If there are changes in master that make the branch not apply cleanly:
- : git checkout -b temp master; git merge <local-branch-name>
-# If error, reset temp, merge master into local; else skip these three lines
- : git reset --hard HEAD;
- : git checkout <local-branch-name>;
+git checkout master
+git merge --no-commit <local-branch-name>
+git reset --hard HEAD;
+git checkout <local-branch-name>;
+
+# If there are changes in master that make the branch not apply cleanly, there
+# should have been en error during the merge step above. If there was an
+# error, merge the master branch into the local branch, fix the conflicts, and
+# commit the new version of the local branch.
: git merge master
-# get rid of the temp branch:
- : git branch -D temp
+# Edit files to remove conflict
+ : git commit -s
# Checkout the local branch, to create the patch to send to the policy
git checkout <local-branch-name>
-
<p>
<local-branch-name> is some convenient name designating your local
changes. You may want to use some common prefix like local-. You can
</div>
-<div id="outline-container-4.1" class="outline-3">
-<h3 id="sec-4.1">Maintenance procedures </h3>
-<div class="outline-text-3" id="text-4.1">
+<div id="outline-container-4_1" class="outline-3">
+<h3 id="sec-4_1">Maintenance procedures </h3>
+<div class="outline-text-3" id="text-4_1">
</div>
</div>
-<div id="outline-container-4.2" class="outline-3">
-<h3 id="sec-4.2">Repository layout </h3>
-<div class="outline-text-3" id="text-4.2">
+<div id="outline-container-4_2" class="outline-3">
+<h3 id="sec-4_2">Repository layout </h3>
+<div class="outline-text-3" id="text-4_2">
<p>
</div>
-<div id="outline-container-4.3" class="outline-3">
-<h3 id="sec-4.3">Managing a bug </h3>
-<div class="outline-text-3" id="text-4.3">
+<div id="outline-container-4_3" class="outline-3">
+<h3 id="sec-4_3">Managing a bug </h3>
+<div class="outline-text-3" id="text-4_3">
<p>
# update your local master branch
git checkout master
git pull
-# If there are changes in master that make the branch not apply cleanly:
-: git checkout -b temp master; git merge bug12345-rra
-# If error;
-: git reset --hard HEAD;
-: git checkout bug12345-rra; git branch -D temp
-: git merge master
+
+git checkout master
+git merge --no-commit bug12345-rra
+git reset --hard HEAD;
+
+# If there are changes in master that make the branch not apply cleanly, there
+# should have been en error during the merge step above. If there was an
+# error, merge the master branch into the local branch, fix the conflicts, and
+# commit the new version of the local branch.
+ : git checkout bug12345-rra
+ : git merge master
+# Edit files to remove conflict
+ : git commit -s
+
git checkout master
git merge bug12345-rra
# edit debian/changelog and upgrading-checklist.html
-
<p>
For the debian/changelog entry, use the following format:
</p>
-
<p>
For example:
</p>
-
</div>
</div>
-<div id="outline-container-4.4" class="outline-3">
-<h3 id="sec-4.4">Updating branches </h3>
-<div class="outline-text-3" id="text-4.4">
+<div id="outline-container-4_4" class="outline-3">
+<h3 id="sec-4_4">Updating branches </h3>
+<div class="outline-text-3" id="text-4_4">
<p>
-
<p>
assuming that you haven't packed the refs in your repository.
</p>
</div>
-<div id="outline-container-4.5" class="outline-3">
-<h3 id="sec-4.5">Making a release </h3>
-<div class="outline-text-3" id="text-4.5">
+<div id="outline-container-4_5" class="outline-3">
+<h3 id="sec-4_5">Making a release </h3>
+<div class="outline-text-3" id="text-4_5">
<p>
-
<p>
replacing the version number with the version of the release, of course.
</p>
</div>
-<div id="outline-container-4.6" class="outline-3">
-<h3 id="sec-4.6">Setting release goals </h3>
-<div class="outline-text-3" id="text-4.6">
+<div id="outline-container-4_6" class="outline-3">
+<h3 id="sec-4_6">Setting release goals </h3>
+<div class="outline-text-3" id="text-4_6">
<p>
</div>
<div id="postamble">
<p class="author"> Author: Manoj Srivastava And Russ Allbery
-<a href="mailto:srivasta@debian.org"><srivasta@debian.org></a>
</p>
-<p class="date"> Date: 2009-09-15 15:48:45 CDT</p>
-<p class="creator">HTML generated by org-mode 6.30trans in emacs 23</p>
+<p class="date"> Date: 2010-06-04 09:42:57 PDT</p>
+<p class="creator">HTML generated by org-mode 6.36c in emacs 23</p>
</div>
</div>
</body>
projects / debian / debian-policy.git / blobdiff