Roman and Pat,
I have made some progress toward getting my tutorial ready for release, but I am at a point now where I have hit a wall, and I would like to ask for some advice on how to proceed.
I did do a final edit of the tutorial, format it into xhtml, and add a couple of pictures. I downloaded a copy of Bluefish and used it to format the material into an xhtml file adding the boilerplate provided in the tutorial template by hand. It seemed to render well in the Firefox browser.
I did find a procedure for adding content through git web at https://wiki.gnome.org/Git/Developers and followed it as best as I could. I was able to clone the gimp-web, check out a branch, make local changes and commit them, but then my progress stopped. My questions are:
1) when I performed a 'git branch -r' several branches were listed. I guessed and picked HEAD as it appeared to link to origin/master. When I did a 'git status' and 'git commit -a' I got a warning message that “refname 'HEAD' is ambiguous”. Did I pick the wrong branch? Is there another problem, or is this warning normal?
2) The guidelines I was looking at seemed to be saying I could either use 'git-bz' or 'git push' to get my changes back to the main repository. Neither worked, so I was wondering which technique I should focus on. Would rather not debug them both at this time (could use quite a bit of time, since I don't know what either is trying to do).
The error message that I go with git-bz was:
> bash: git-bz: command not found...
The error message from git push –dry-run was:
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
A git pull –rebase right before trying the push seemed to find the repository and verify that my current branch is up to date.
I would appreciate any pointers you could give me. I am attaching a copy of the transcript from my shell session. I am also attaching a copy of the files I was trying to add & modify in case it is relevant or you would like to take a look at them.
In the mean time, I will start looking at git-bz in case that is the write way to go. It looks like there may be some setup issues, even though the error message make it look like it is an installation issue. The options for the bz command were not clear to me. The wiki page indicated the syntax should be:
git-bz file product/component HEAD
I am guessing the product should be 'gimp-web', but when I look at https://bugzilla.gnome.org/buglist.cgi?quicksearch=gimp-web I see the component listed as both gimp-web and www.gimp.org. Do you know which it should be, or whether it matters? When it asks for 'file' I am assuming it is looking for the results of the local 'commit'. In my case the feedback was
[HEAD a97ce5a] Added tutorial Automate Creation fo XCF from JPG"
Are they looking for a97ce5a as the file?
Thanks,
Stephen Kiel
Dear Stephen,
On Tue, Jul 02, 2013 at 12:37:33PM -0700, Stephen Kiel wrote:
> Roman,
>Not sure. I think these are remnants of old edits which have simply been
> I did browse through some of the tutorials & looked at they way they were
> marked up. I don't think porting my tutorials into a markup language will
> be any problem. The part that I don't really understand yet is whether
> there are tags that will or won't work right. In other words, if the XHTLM
> is well formed and presents in a web browser is there any downstream
> processing that looks at or uses particular tags? e.g. some of the xhtml
> that I looked at used the older <b> tags for bold instead of <strong>.
> Both work, one is more contemporary, but what I am wondering is whether
> there is a reason to use the older tag format.
updated for a new version of the website.
Usually you can send in your patches and they're been reviewed by people
> Once I do get ready to check out the module and add my tutorial, is there
> any kind of an approval process, or do I just stage the changes and commit
> them?
who have access to the module. The more you contribute, the more likely
maintainers see to getting you commit (read: push) rights.
Happy to help!
> Thanks for the feedback & help.
--
26602 Strafford
Mission Viejo, CA 92692
Mobile/SMS (949) 702-1993
Home (949) 367-2915
[stephen@localhost gimp-web-staging]$ which git /usr/bin/git [stephen@localhost gimp-web-staging]$ git config --global user.name "Stephen Kiel" [stephen@localhost gimp-web-staging]$ git config --global user.email snick.kiel@xxxxxxxxx [stephen@localhost gimp-web-staging]$ git config --global color.ui auto [stephen@localhost gimp-web-staging]$ git clone git://git.gnome.org/gimp-web Cloning into 'gimp-web'... remote: Counting objects: 16053, done. remote: Compressing objects: 100% (6204/6204), done. remote: Total 16053 (delta 10709), reused 14402 (delta 9672) Receiving objects: 100% (16053/16053), 66.74 MiB | 387.00 KiB/s, done. Resolving deltas: 100% (10709/10709), done. [stephen@localhost gimp-web-staging]$ cd gimp-web/ [stephen@localhost gimp-web]$ ls about downloads install.sh release-notes admin error irc.htrw robots.txt announcements features links screenshots archive.htrw gimp-web.doap macintosh source books google33e0e7c6a0a36ade.html mail_lists.htrw style bugs images MAINTAINERS team.htrw ChangeLog includes Makefile template.htrw contest index.htrw man tutorials develop INSTALL news unix docs install.config.sample nopatents.html webmasters.htrw donating install.exclude programmatic windows [stephen@localhost gimp-web]$ git branch -r origin/2-8-temp origin/HEAD -> origin/master origin/master origin/master_svn1715 origin/old-trunk origin/static-html5 origin/v2.4 origin/v2.6 [stephen@localhost gimp-web]$ git checkout -b HEAD origin/HEAD Branch HEAD set up to track remote branch master from origin. Switched to a new branch 'HEAD' [stephen@localhost gimp-web]$ cd tutorials [stephen@localhost tutorials]$ ls 3d_Logo ContrastMask Quickmask Advanced_Animations Creating_Icons Red_Eye_Removal Anti-Aliased_Threshold Custom_Brushes Reducing_CCD_Noise Basic_Batch Drawables Selective_Color Basic_Perl Draw_A_Paint_Brush Selective_Gaussian_Blur Basic_Scheme Drawing_Shapes Sepia_Toning Basic_Scheme2 Film_Grain Simple_Animations Bezier_Selections Golden_Text Sketch_Effect Blending_Exposures Image_Map Smart_Sharpening Blown_Out_Highlights Image_Pipes Straight_Line Blur_Overlays Image_Pipes2 template Borders_On_Selections index.htrw The_Basics Changing_Background_Color_1 Lite_Quickies Tileable_Textures Changing_Background_Color_2 Perl-Debugged Using_GAP Color2BW Perlotine Coloring_A_BW_Sketch Photo_To_Sketch [stephen@localhost tutorials]$ cp -R ~/Documents/gimp_tutorial/AutomatedJpgToXcf/ . [stephen@localhost tutorials]$ ls 3d_Logo Coloring_A_BW_Sketch Photo_To_Sketch Advanced_Animations ContrastMask Quickmask Anti-Aliased_Threshold Creating_Icons Red_Eye_Removal AutomatedJpgToXcf Custom_Brushes Reducing_CCD_Noise Basic_Batch Drawables Selective_Color Basic_Perl Draw_A_Paint_Brush Selective_Gaussian_Blur Basic_Scheme Drawing_Shapes Sepia_Toning Basic_Scheme2 Film_Grain Simple_Animations Bezier_Selections Golden_Text Sketch_Effect Blending_Exposures Image_Map Smart_Sharpening Blown_Out_Highlights Image_Pipes Straight_Line Blur_Overlays Image_Pipes2 template Borders_On_Selections index.htrw The_Basics Changing_Background_Color_1 Lite_Quickies Tileable_Textures Changing_Background_Color_2 Perl-Debugged Using_GAP Color2BW Perlotine [stephen@localhost tutorials]$ ls AutomatedJpgToXcf/ example-jpeg-to-xcf.py index.htrw gimp_jpg_to_xcf_popup.jpg index.htrw~ gimp_menu_compare.jpg script-fu-example-jpg-to-xcf.scm [stephen@localhost tutorials]$ rm AutomatedJpgToXcf/index.htrw~ [stephen@localhost tutorials]$ ls AutomatedJpgToXcf/ example-jpeg-to-xcf.py index.htrw gimp_jpg_to_xcf_popup.jpg script-fu-example-jpg-to-xcf.scm gimp_menu_compare.jpg [stephen@localhost tutorials]$ pwd /home/stephen/gimp-web-staging/gimp-web/tutorials [stephen@localhost tutorials]$ diff index.htrw ~/Documents/gimp_tutorial/index.htrw 183a184,188 > <h2><a name="Automation"></a>Automating Gimp</h2> > <p> > <a href="AutomatedJpgToXcf/">Automated Jpg to Xcf</a> Import Xcf Images a Directory at a Time. > </p> > 189c194,197 < | <a href="#Script">Script Authoring</a>]</p> --- > | <a href="#Script">Script Authoring</a> > | <a href="#Automation">Automating Gimp</a>] > > </p> [stephen@localhost tutorials]$ cp ~/Documents/gimp_tutorial/index.htrw . [stephen@localhost tutorials]$ diff index.htrw ~/Documents/gimp_tutorial/index.htrw [stephen@localhost tutorials]$ cd .. [stephen@localhost gimp-web]$ pwd /home/stephen/gimp-web-staging/gimp-web [stephen@localhost gimp-web]$ git status warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. # On branch HEAD # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # # modified: tutorials/index.htrw # # Untracked files: # (use "git add <file>..." to include in what will be committed) # # tutorials/AutomatedJpgToXcf/ no changes added to commit (use "git add" and/or "git commit -a") [stephen@localhost gimp-web]$ git diff diff --git a/tutorials/index.htrw b/tutorials/index.htrw index ee3e608..da300e5 100644 --- a/tutorials/index.htrw +++ b/tutorials/index.htrw @@ -181,12 +181,20 @@ <a href="Basic_Scheme2/">GIMP Script-Fu 2</a> Write More Scheme for GIMP. </p> +<h2><a name="Automation"></a>Automating Gimp</h2> +<p> + <a href="AutomatedJpgToXcf/">Automated Jpg to Xcf</a> Import Xcf Images a Di +</p> + <p class="navindex">[<a href="#Beginner">Beginner</a> | <a href="#Intermediate">Intermediate</a> | <a href="#Expert">Expert</a> | <a href="#Photo">Photo Editing</a> | <a href="#Web">Web</a> -| <a href="#Script">Script Authoring</a>]</p> +| <a href="#Script">Script Authoring</a> +| <a href="#Automation">Automating Gimp</a>] + +</p> [stephen@localhost gimp-web]$ git commit -a warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. [HEAD a97ce5a] Added tutorial Automate Creation fo XCF from JPG" 1 file changed, 9 insertions(+), 1 deletion(-) [stephen@localhost gimp-web]$ git-bz [HEAD a97ce5a] gimp-web/tutorials HEAD bash: git-bz: command not found... [stephen@localhost gimp-web]$ git pull --rebase warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. warning: refname 'HEAD' is ambiguous. Current branch HEAD is up to date. [stephen@localhost gimp-web]$ git push --dry-run warning: push.default is unset; its implicit value is changing in Git 2.0 from 'matching' to 'simple'. To squelch this message and maintain the current behavior after the default changes, use: git config --global push.default matching To squelch this message and adopt the new behavior now, use: git config --global push.default simple See 'git help config' and search for 'push.default' for further information. (the 'simple' mode was introduced in Git 1.7.11. Use the similar mode 'current' instead of 'simple' if you sometimes use older versions of Git) fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists. [stephen@localhost gimp-web]$
Attachment:
AutomatedJpgToXcf.tar.gz
Description: GNU Zip compressed data
Attachment:
index.htrw
Description: Binary data
_______________________________________________ gimp-docs-list mailing list gimp-docs-list@xxxxxxxxx https://mail.gnome.org/mailman/listinfo/gimp-docs-list
