Your message dated Tue, 22 Mar 2011 12:13:49 +0000
with message-id <[email protected]>
and subject line Bug#619084: fixed in git-buildpackage 0.5.20
has caused the Debian Bug report #619084,
regarding git-buildpackage: Patch to document easier way of creating orphan
upstream branch.
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
619084: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619084
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: git-buildpackage
Version: 0.5.19
Severity: wishlist
Tags: patch
Dear Guido,
in echo to #471560, here are two patches for docs/chapters/import.sgml. The
first
adds some markup similar to the example in the neighboring section. The seconds
adds a simpler example for the creation of empty upstream branches. It has the
same number of lines, but I find it easier to remember. It needs a Git version
of 1.7.2.3 at least.
Have a nice day,
--
Charles Plessy
Tsurumi, Kanagawa, Japan
>From 659b1267c0a036e53b2bc73109f7f87601f5f3a8 Mon Sep 17 00:00:00 2001
From: Charles Plessy <[email protected]>
Date: Mon, 21 Mar 2011 11:16:23 +0900
Subject: [PATCH 1/2] Added markup to the example for creating upstream branch.
---
docs/chapters/import.sgml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index cbb8804..c989317 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -142,10 +142,10 @@ EOF
mergeWithUpstream was set for svn-buildpackage), you can create an empty
upstream branch with the following commands:
<screen>
- git symbolic-ref HEAD refs/heads/upstream
- git rm --cached -r .
- git commit --allow-empty -m 'Initial upstream branch.'
- git checkout -f master
+ <command>git symbolic-ref</command> <replaceable>HEAD</replaceable>
<replaceable>refs/heads/upstream</replaceable>
+ <command>git rm</command> <option>--cached</option> <option>-r</option>
<replaceable>.</replaceable>
+ <command>git commit</command> <option>--allow-empty</option>
<option>-m</option> <replaceable>'Initial upstream branch.'</replaceable>
+ <command>git checkout</command> <option>-f</option>
<replaceable>master</replaceable>
</screen>
</para>
</sect2>
--
1.7.2.5
>From 386ee90b4f88b81250808971be644b9b321a4a23 Mon Sep 17 00:00:00 2001
From: Charles Plessy <[email protected]>
Date: Mon, 21 Mar 2011 11:19:58 +0900
Subject: [PATCH 2/2] # Easier to remember commands to create orphan upstream
branch.
---
docs/chapters/import.sgml | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml
index c989317..c4a5f1f 100644
--- a/docs/chapters/import.sgml
+++ b/docs/chapters/import.sgml
@@ -142,6 +142,13 @@ EOF
mergeWithUpstream was set for svn-buildpackage), you can create an empty
upstream branch with the following commands:
<screen>
+ <command>git checkout</command> <option>--orphan</option>
<replaceable>upstream</replaceable>
+ <command>git rm</command> <option>-rf</option> <replaceable>.</replaceable>
+ <command>git commit</command> <option>--allow-empty</option>
<option>-m</option> <replaceable>'Initial upstream branch.'</replaceable>
+ <command>git checkout</command> <option>-f</option>
<replaceable>master</replaceable>
+</screen>
+ With Git versions lower than 1.7.2.3, the commands are slightly more
complicated:
+<screen>
<command>git symbolic-ref</command> <replaceable>HEAD</replaceable>
<replaceable>refs/heads/upstream</replaceable>
<command>git rm</command> <option>--cached</option> <option>-r</option>
<replaceable>.</replaceable>
<command>git commit</command> <option>--allow-empty</option>
<option>-m</option> <replaceable>'Initial upstream branch.'</replaceable>
--
1.7.2.5
--- End Message ---
--- Begin Message ---
Source: git-buildpackage
Source-Version: 0.5.20
We believe that the bug you reported is fixed in the latest version of
git-buildpackage, which is due to be installed in the Debian FTP archive:
git-buildpackage_0.5.20.dsc
to main/g/git-buildpackage/git-buildpackage_0.5.20.dsc
git-buildpackage_0.5.20.tar.gz
to main/g/git-buildpackage/git-buildpackage_0.5.20.tar.gz
git-buildpackage_0.5.20_all.deb
to main/g/git-buildpackage/git-buildpackage_0.5.20_all.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Guido Günther <[email protected]> (supplier of updated git-buildpackage package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 21 Mar 2011 21:09:32 +0100
Source: git-buildpackage
Binary: git-buildpackage
Architecture: source all
Version: 0.5.20
Distribution: experimental
Urgency: low
Maintainer: Guido Günther <[email protected]>
Changed-By: Guido Günther <[email protected]>
Description:
git-buildpackage - Suite to help with Debian packages in Git repositories
Closes: 588752 618893 619084
Changes:
git-buildpackage (0.5.20) experimental; urgency=low
.
[ Guido Günther ]
* [a618bdc] git-buildpackage: Make the desktop notification transient so
they timeout and don't clutter the notification area.
* [3b0f296] Add gbp-configure-unpatched-source example to ignore .pc and
tell dpkg-source to unpatch the source. See #591858.
* [258743a] gbp-pull: make sure git interprets arguments as revisions in
is_fast_forward so it prints a clearer error message on configuration
errors in .git/config.
* [40f4709] gbp-pq: Allow to specify subdirs for patches via the
"Gbp-Pq-Tag: <subdir>" directive in the patch header. This also gets rid
sed callouts. Add "apply" action to apply single patches.
* [fadcfcb] gbp: Add git.archive() and git.{has,get,update,add}_submodules()
and testcases.
Heavily based on work by Sean Finney and Chow Loong Jin
* [2353ab7] git-buildpackage: submodule support for dump_tree.
Heavily based on work by Sean Finney and Chow Loong Jin
* [97c32c7] git-buildpackage: submodule support for git_archive.
Heavily based on work by Sean Finney and Chow Loong Jin (Closes: #588752)
* [3b0ebe9] gbp: Don't fail on paths without extensions in get_compression()
and add doctests for that. (Closes: #618893)
* [1021f84] git-buildpackage: special case non-submodule tarfile generation.
Tarfile generation with submodules is slower since we need to
concatenate several tarfiles and compress afterwards. So special case
the common non submodule case and add a testcase to check the tarfiles
content.
* [80048e9,dcc2562,0827a33,93b4ab7,adc50a3,431075b] improve our testsuite
.
[ Sean Finney ]
* [ddf5ea3] gbp: Allow to pass cwd to git.__get_output()
.
[ Charles Plessy ]
* [c9f1e1e] docs: Added markup to the example for creating upstream branch.
* [0095808] docs: Easier to remember commands to create orphan upstream
branch.
Closes: #619084
Checksums-Sha1:
885af1efda1d41185cfada91a4ad4aa31410f5bd 1102 git-buildpackage_0.5.20.dsc
0f4c3b0f8ad7407a60bffff73e79bc707bb5fcf5 104124 git-buildpackage_0.5.20.tar.gz
89660561daec536249a7946d8f291d1219f2473b 127456 git-buildpackage_0.5.20_all.deb
Checksums-Sha256:
2a1f0f7757555bd0891e203cfd063188bf6632653533dc219b7077bd40d6097d 1102
git-buildpackage_0.5.20.dsc
5917aa7d6133d1105c82cbe0a87bac27353be5173a242e601f6cad0d404142b7 104124
git-buildpackage_0.5.20.tar.gz
8fc7a110ecf5b882e2ed53d5b2e2f16119e51d2f6de466a52e49ad290f29b66b 127456
git-buildpackage_0.5.20_all.deb
Files:
8fa2daa61eabcb3060521145c3a4c783 1102 vcs optional git-buildpackage_0.5.20.dsc
67f07a4ecb029785f51872a53c9ba7df 104124 vcs optional
git-buildpackage_0.5.20.tar.gz
9d094bbb0f091cbc74780ea2384e3064 127456 vcs optional
git-buildpackage_0.5.20_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iD8DBQFNh7vMn88szT8+ZCYRAp3FAJ9EvjXeEcqi44aw7klnbYWEOiXa3wCdGpK7
S9meMkufeUVPMomI6S4r8XY=
=aUoP
-----END PGP SIGNATURE-----
--- End Message ---
