Looks like 2007-02-f has gone up
LesleyB
I think I have managed to get a 2007-02-f branch up.
Will wait until someone confirms it's okay.
Please note the diffs on the pod - I nitted - removing a repeated
paragraph and a little typo.
Regards
L.
Paul Fenwick
LesleyB wrote:
> I think I have managed to get a 2007-02-f branch up.
I can see the branch, but I can't see your commits in it. The last ones
listed as the ones from me (before it branched):
http://github.com/pfenwick/perl589delta/commits/2007-02-f
Can you confirm that you've made the commits, and do another 'git push' just
to make sure they've gone up? A 'git status' may prove useful to say which
branch you're working on, and while files have been changed but not
committed (if any).
Many thanks!
Paul
--
Paul Fenwick <p...@perltraining.com.au> | http://perltraining.com.au/
Director of Training | Ph: +61 3 9354 6001
Perl Training Australia | Fax: +61 3 9354 2681
Lesley Binks
>
> G'day Lesley,
>
> LesleyB wrote:
>
>> I think I have managed to get a 2007-02-f branch up.
>
> I can see the branch, but I can't see your commits in it. The last ones
> listed as the ones from me (before it branched):
>
> http://github.com/pfenwick/perl589delta/commits/2007-02-f
>
> Can you confirm that you've made the commits, and do another 'git push' just
> to make sure they've gone up? A 'git status' may prove useful to say which
> branch you're working on, and while files have been changed but not
> committed (if any).
>
> Many thanks!
>
> Paul
>
Hi Paul
I checked with 'git status' and got
# On branch master
# Changed but not updated:
# (use "git add <file>..." to update what will be committed)
#
# modified: TODO
# modified: perl589delta.pod
# modified: splits/2007-02-f.txt
So I did a git add on each file but the git push came back with
git push origin 2007-02-f
Enter passphrase for key '/home/lesleyb/.ssh/id_rsa':
Everything up-to-date
so it looks like it's trying to check in to the master despite my having done
git clone git://github.com/pfenwick/perl589delta
and then edited the [remote "origin"] url to
g...@github.com:pfenwick/perl589delta.git, followed by
git checkout master
git pull
git branch 2007-02-f
as per instructuions
Let me know if you know where the problem is.
Regards
Lesley
Paul Fenwick
Lesley Binks wrote:
> So I did a git add on each file but the git push came back with
> git push origin 2007-02-f
> Let me know if you know where the problem is.
'git add' simply schedules the files to be committed as part of a changeset,
but doesn't actually commit them. If you do a 'git status' you'll see
they're scheduled for a commit. You can commit them with:
git commit
Once you've done that, a 'git push' should send your changes back. If in
doubt at any stage, 'git status' will let you know the state of your repo.
If you *have* committed your files, then things are real odd, and I may ask
for patches instead.
Many thanks again for all your hard work!
Lesley Binks
>
> G'day Lesley,
>
> Lesley Binks wrote:
>
>> So I did a git add on each file but the git push came back with
>> git push origin 2007-02-f
>
>> Let me know if you know where the problem is.
>
> 'git add' simply schedules the files to be committed as part of a changeset,
> but doesn't actually commit them. If you do a 'git status' you'll see
> they're scheduled for a commit. You can commit them with:
>
> git commit
>
> Once you've done that, a 'git push' should send your changes back. If in
> doubt at any stage, 'git status' will let you know the state of your repo.
>
> If you *have* committed your files, then things are real odd, and I may ask
> for patches instead.
>
> Many thanks again for all your hard work!
>
> Paul
Well ... I have no idea if anything has gone up.
I tried the git commit, followed by a git push origin 2007-02-f with
no apparent success.
git status returns
# On branch master
nothing to commit (working directory clean)
I'm workiong on it over ssh so here's a copy of git show TODO so you
can see what's happening there.
Author: LesleyB <lesley...@gmail.com>
Date: Wed Sep 24 22:27:02 2008 +0100
2007-02-f branch check in
diff --git a/TODO b/TODO
index 4bbf11a..b3cac1f 100644
--- a/TODO
+++ b/TODO
@@ -19,3 +19,10 @@
* Are ptar and ptardiff really out? They are in 5.10.0 --aflott
* 29609 says "Upgrade to Text::Balanced 2.0.0" and doesn't seem to get
reverted later on, but lib/Text/Balanced.pm says it's 1.98 --moritz
+* 30224 was a lot of work on perlrun.pd but also has extr stuff I could
+ not translate into anything useful - specifically 28528, 28578, 29168,
+ 29299, 29358 and 29544.
+* Unsure what to do with 30237 which contains 28870, 28982, 29778.
+ Similarly 30232 (27228, 29669), 30230 (26799), 30227 (28715),
+ 30225 (28238), 30223 (30183, 30218), 30222 (30087, 30129),
+ 30209 ( 29593,29594, 29659,30010), 30208 (28513)
I'm sorry this is turning into a bit of a nuisance. I can diff -Nur
but against what that would be of any use to you.?
The git show also shows a diff which might be more relevant. Which
would you prefer I use?
Regards
Lesley
Paul Fenwick
Lesley Binks wrote:
> git status returns
> # On branch master
Aha! There's our problem! We're on the master branch, not the 2007-02-f
branch. ;)
At this point you can try to send your changes back to the main branch (a
simple 'git push') will do this, but it may complain about things not being
up-to-date, or otherwise give you merge headaches.
I'm happy to handle all the merging efforts; I effectively view that as my job.
There is almost certainly some git magic I can apply to make everything
better, but I'm not yet skilled enough to be certain I'd get the commands
right over e-mail. So at this point, I suggest we fall back to the
super-foolproof method.
Can you do a 'git gc' and then make a tarball of your working directory and
e-mail it directly to me (p...@perltraining.com.au)? I'll cherry-pick the
commits across.
Many thanks again for all your hard work, and my apologies for the git
teething issues.
All the very best,