RFU jed 1:0.99.19~pre143-1

Jörg Sommer joerg at alea.gnuu.de
Thu Jun 26 11:58:28 UTC 2008


Hallo Rafael,

Rafael Laboissiere schrieb am Wed 25. Jun, 12:30 (+0200):
> * Jörg Sommer <joerg at alea.gnuu.de> [2008-06-25 09:43]:
> 
> > On suggestion: The first commit should not include the line with the
> > asterisk *, because it's a line that get's removed by the next commit. My
> > suggestion:
> > 
> > jed (1:0.99.19~pre143-2) UNRELEASED; urgency=low
> > 
> >  -- Rafael Laboissiere <rafael at debian.org>  Tue, 24 Jun 2008 13:46:05 +0200
> > 
> > Do “git rebase -i HEAD~2” in your branch, replace the first “pick” by
> > “edit”, when rebase stopps change the file and do “git commit -a
> > --amend”, then do “git rebase --continue”.
> 
> For the sake of learning more of git, I tried the command above but got
> several "needs update" warnings and a message "Working tree is dirty".

Then you had files in the working tree they were modified. You can find
out which files these are with git status.

> Could you please merge my branch into master?

Firstly, we are working with the branch 0.99.19 and not master. The
master branch still contains the 0.99.18 development.

I've started from scratch, because I did not add the override.

At me co is an alias for checkout, ca an alias for commit --all, and d
an alias for diff. I'm lazy.

% git co -b 0.99.19 origin/0.99.19
% xjed debian/changelog&
[1] 19744
% git ca -m "Start a new version"
Created commit 61cdd95: Start a new version
 1 files changed, 4 insertions(+), 0 deletions(-)
% git d
% git ca
Created commit f65ecef: Add slsh as build‐dependency
 2 files changed, 4 insertions(+), 1 deletions(-)
% git d
% git ca
Created commit ed5a89f: Workaround for wrong terminfo entry for rxvt-unicode
 2 files changed, 11 insertions(+), 0 deletions(-)
% git ca
Created commit 493b090: Remove FAQs they are also in jed_faq
 2 files changed, 3 insertions(+), 91 deletions(-)
% git push
Counting objects: 27, done.
Compressing objects: 100% (20/20), done.
Writing objects: 100% (20/20), 2.76 KiB, done.
Total 20 (delta 15), reused 0 (delta 0)
To ssh://git.debian.org/git/pkg-jed/jed.git
   f773193..493b090  0.99.19 -> jo-0.99.19

Now you can go on:

% git fetch
% git co -b new origin/0.99.19
Branch new set up to track remote branch refs/remotes/origin/0.99.19.
Switched to a new branch "new"
% git merge origin/jo-0.99.19
Updating f773193..493b090
Fast forward
 debian/README.Debian          |   91 -----------------------------------------
 debian/changelog              |   13 ++++++
 debian/control                |    2 +-
 debian/init.d/05jed-common.sl |    8 ++++
 4 files changed, 22 insertions(+), 92 deletions(-)
% git log --name-status 1%3A0.99.19%7Epre143-1..
% xjed debian/changelog
% git --no-pager d
diff --git a/debian/changelog b/debian/changelog
index d0ddb1e..76ff7a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jed (1:0.99.19~pre143-2) UNRELEASED; urgency=low
+jed (1:0.99.19~pre143-2) experimental; urgency=low
 
   * Added slsh as build-dependency to make the test suite work.
     (closes: #488011)
@@ -9,7 +9,7 @@ jed (1:0.99.19~pre143-2) UNRELEASED; urgency=low
   * Removed questions and answers from README.Debian they are in
     jed_faq.txt, too. They are included in jed_faq since 0.99.19~pre136.
 
- -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 01 Jan 1970 00:00:00 +0000
+ -- Jörg Sommer <joerg at alea.gnuu.de>  Thu, 26 Jun 2008 13:48:21 +0200
 
 jed (1:0.99.19~pre143-1) experimental; urgency=low
 
% git ca -m "Release of 1:0.99.19~pre143-2"
Created commit ed032d2: Release of 1:0.99.19~pre143-2
 1 files changed, 2 insertions(+), 2 deletions(-)
% git tag 1%3A0.99.19%7Epre143-2
% git push origin HEAD:refs/heads/0.99.19
% git push --tags

Hope it works.

Regards, Jörg
-- 
Diskusion „Pascal vs. Rest der Welt“:
30 Aug 2000 00:13:11 GMT, Adrian Knoth <adi at drcomp.erfurt.thur.de>
Und selbst wenn eure 100000 Zeilen‐Programme noch so oft unter Windows
verwendet werden: mit einem Handwagen fährt man nicht Formel‐1.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature http://en.wikipedia.org/wiki/OpenPGP
Url : http://lists.alioth.debian.org/pipermail/pkg-jed-devel/attachments/20080626/a69d7cac/attachment.pgp 


More information about the Pkg-jed-devel mailing list