<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<HTML><HEAD>
<META content="text/html; charset=iso-8859-1" http-equiv=Content-Type>
<META name=GENERATOR content="MSHTML 8.00.6001.18999">
<STYLE></STYLE>
</HEAD>
<BODY bgColor=#ffffff>
<DIV><FONT size=2 face=Arial>Walter,</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<DIV><FONT size=2 face=Arial>My sources of gitorious info were: the Activity
Team/Git FAQ, the Activity Team/Git Tutorial, and Importing your project from
OLPC.</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<DIV><FONT size=2 face=Arial>I found the material disorganized, unnecessarily
abstruse and technical, and not at all user-friendly (at least for the
beginner).</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<DIV><FONT size=2 face=Arial>For the newbee, only the essentials are needed, and
clarity of expression and direction are crucial. This, particularly. for those
of us whose knowledge of Linux and Sugar is elementary.</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<DIV><FONT size=2 face=Arial>Take, for example, the Git Tutorial - which I
expected to be the most helpful of the above: three-quarters of the material is
nonessential, and the info on creating an account and SSH key are grossly
inadequate. Furthermore, there is no treatment of anything but the git *init*
procedure - nothing about creating a local depository through pulling from
gitorious (my particular issue).</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<DIV><FONT size=2 face=Arial>Specifically, the nuts and bolts of a practical,
understandable series of steps to accomplish simple objectives are
lacking.</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<DIV><FONT size=2 face=Arial>Solving these problems by furnishing down-to-earth
practical instructions would be of great help. (I also know that this is
somewhat of a challenge in an open-source environment, so I don't expect
miracles. Often, as in my case, listservs such as this one - and generous souls
such as you - are the principal resource for newbees. And thank goodness for
yawl (I'm from North Carolina - aka the South).</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<DIV><FONT size=2 face=Arial>Art Hunkins</FONT></DIV>
<DIV><FONT size=2 face=Arial></FONT> </DIV>
<BLOCKQUOTE
style="BORDER-LEFT: #000000 2px solid; PADDING-LEFT: 5px; PADDING-RIGHT: 0px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 0px">
<DIV style="FONT: 10pt arial">----- Original Message ----- </DIV>
<DIV
style="FONT: 10pt arial; BACKGROUND: #e4e4e4; font-color: black"><B>From:</B>
<A title=walter.bender@gmail.com href="mailto:walter.bender@gmail.com">Walter
Bender</A> </DIV>
<DIV style="FONT: 10pt arial"><B>To:</B> <A title=abhunkin@uncg.edu
href="mailto:abhunkin@uncg.edu">Art Hunkins</A> </DIV>
<DIV style="FONT: 10pt arial"><B>Cc:</B> <A title=quozl@laptop.org
href="mailto:quozl@laptop.org">James Cameron</A> ; <A
title=Sugar-devel@lists.sugarlabs.org
href="mailto:Sugar-devel@lists.sugarlabs.org">Sugar-devel@lists.sugarlabs.org</A>
</DIV>
<DIV style="FONT: 10pt arial"><B>Sent:</B> Tuesday, December 28, 2010 4:49
PM</DIV>
<DIV style="FONT: 10pt arial"><B>Subject:</B> Re: [Sugar-devel] git problems
(reprise)</DIV>
<DIV><BR></DIV><BR><BR>
<DIV class=gmail_quote>On Tue, Dec 28, 2010 at 3:47 PM, Art Hunkins <SPAN
dir=ltr><<A
href="mailto:abhunkin@uncg.edu">abhunkin@uncg.edu</A>></SPAN> wrote:<BR>
<BLOCKQUOTE
style="BORDER-LEFT: rgb(204,204,204) 1px solid; MARGIN: 0pt 0pt 0pt 0.8ex; PADDING-LEFT: 1ex"
class=gmail_quote>James,<BR><BR>Thanks for your wonderful, clear and
understandable instructions. They work wonderfully and all my problems are
gone.<BR><BR>BTW, your procedure is *much* more user-friendly (and simpler)
than any of the git material on the wiki. It would really be helpful to have
your easy step-by-step available online: perhaps one procedure for initial
commit, and one for followups (like for my case). Of all the challenges I've
faced with Linux/Sugar, perhaps gitorious has been the greatest and most
frustrating.<BR></BLOCKQUOTE>
<DIV><BR>Can you tell me where in the wiki you were finding confusing
instructions so we can update them?<BR><BR>-walter<BR> <BR></DIV>
<BLOCKQUOTE
style="BORDER-LEFT: rgb(204,204,204) 1px solid; MARGIN: 0pt 0pt 0pt 0.8ex; PADDING-LEFT: 1ex"
class=gmail_quote><BR>Please advise me on one point: once the local repo is
established (filemix.git), what's the simplest way to copy all my (revised)
activity files (including subdirectory) to filemix.git? When preparing a new
push, I've often forgotten just which files I've modified, and don't wish to
omit any (and so would use git add . for the following step). Let's say that
the source files were in FileMix.activity and that both FileMix.activity and
filemix.git were in the Activities folder.<BR><BR>Once again, many
thanks.<BR><BR>Art Hunkins<BR><BR>----- Original Message ----- From: "James
Cameron" <<A href="mailto:quozl@laptop.org"
target=_blank>quozl@laptop.org</A>><BR>To: "Art Hunkins" <<A
href="mailto:abhunkin@uncg.edu"
target=_blank>abhunkin@uncg.edu</A>><BR>Cc: <<A
href="mailto:Sugar-devel@lists.sugarlabs.org"
target=_blank>Sugar-devel@lists.sugarlabs.org</A>><BR>Sent: Monday,
December 27, 2010 11:09 PM<BR>Subject: Re: [Sugar-devel] git problems
(reprise)
<DIV>
<DIV></DIV>
<DIV class=h5><BR><BR><BR>
<BLOCKQUOTE
style="BORDER-LEFT: rgb(204,204,204) 1px solid; MARGIN: 0pt 0pt 0pt 0.8ex; PADDING-LEFT: 1ex"
class=gmail_quote>On Mon, Dec 27, 2010 at 10:27:26PM -0500, Art Hunkins
wrote:<BR>
<BLOCKQUOTE
style="BORDER-LEFT: rgb(204,204,204) 1px solid; MARGIN: 0pt 0pt 0pt 0.8ex; PADDING-LEFT: 1ex"
class=gmail_quote>then:<BR>git init<BR></BLOCKQUOTE><BR>This is where you
went wrong. You've created an entirely new repository<BR>instead of
cloning the existing one.<BR><BR>
<BLOCKQUOTE
style="BORDER-LEFT: rgb(204,204,204) 1px solid; MARGIN: 0pt 0pt 0pt 0.8ex; PADDING-LEFT: 1ex"
class=gmail_quote>git add <the three changed files - as listed
below><BR>git status<BR><everything looks good><BR><BR>the
console output then picks up and tells the rest of the
story:<BR><BR>[liveuser@localhost FileMix.activity]$ git commit -a
-m"Version 4<BR>changes: ObjectChooser and Sugar-version ID
reworked"<BR>[master (root-commit) 3b7e345] Version 4 changes:
ObjectChooser and<BR>Sugar-version ID reworked<BR>3 files changed, 494
insertions(+), 0 deletions(-)<BR>create mode 100755
FileMixReadMe.txt<BR>create mode 100755 activity/<A
href="http://activity.info" target=_blank>activity.info</A><BR>create
mode 100755 filemix.py<BR>[liveuser@localhost FileMix.activity]$ git
push<BR>gitorious@git.sugarlabs.org:filemix/mainline.git<BR>To
gitorious@git.sugarlabs.org:filemix/mainline.git<BR>! [rejected]
master -> master (non-fast-forward)<BR>error:
failed to push some refs
to<BR>'gitorious@git.sugarlabs.org:filemix/mainline.git'<BR>To prevent
you from losing history, non-fast-forward updates were rejected<BR>Merge
the remote changes before pushing again. See the
'non-fast-forward'<BR>section of 'git push --help' for
details.<BR></BLOCKQUOTE><BR>As you guess, the push is where the problem
happened. The cause<BR>of this error is that you are trying to push
from a repository that<BR>doesn't have the same history of change.
This is because your new local<BR>repository is totally unrelated to
the remote repository. It is<BR>unrelated because it was created
with "git init" instead of "git clone".<BR><BR>You might do one of these
things:<BR><BR>1. clone into a new directory, copy those changed
files into it,<BR>commit, and push again,<BR><BR>2. understand the
difference between the history of your local<BR>repository and the remote
repository, and adjust it somehow, such as<BR>with a merge before a
push.<BR><BR>I recommend (1) above. I don't recommend (2), although
it is possible,<BR>it is not necessary.<BR><BR>I'm happy to try to help
you through this, and I've cloned the<BR>repository git://<A
href="http://git.sugarlabs.org/filemix/mainline.git"
target=_blank>git.sugarlabs.org/filemix/mainline.git</A> so that I can
be<BR>prepared to answer questions.<BR><BR>Expanding on (1)
above:<BR><BR>git clone gitorious@git.sugarlabs.org:filemix/mainline.git
filemix.git<BR>cd filemix.git<BR>cp ${THOSE_FILES} .<BR>git add
FileMixReadMe.txt activity/<A href="http://activity.info"
target=_blank>activity.info</A> filemix.py<BR>git commit -m 'Version 4
changes: ObjectChooser and Sugar-version ID reworked'<BR>git
push<BR><BR>-- <BR>James Cameron<BR><A href="http://quozl.linux.org.au/"
target=_blank>http://quozl.linux.org.au/</A>
<BR></BLOCKQUOTE><BR>_______________________________________________<BR>Sugar-devel
mailing list<BR><A href="mailto:Sugar-devel@lists.sugarlabs.org"
target=_blank>Sugar-devel@lists.sugarlabs.org</A><BR><A
href="http://lists.sugarlabs.org/listinfo/sugar-devel"
target=_blank>http://lists.sugarlabs.org/listinfo/sugar-devel</A><BR></DIV></DIV></BLOCKQUOTE></DIV><BR><BR
clear=all><BR>-- <BR>Walter Bender<BR>Sugar Labs<BR><A
href="http://www.sugarlabs.org">http://www.sugarlabs.org</A><BR><BR></BLOCKQUOTE></BODY></HTML>