<div class="gmail_quote">On Tue, Dec 28, 2010 at 3:47 PM, Art Hunkins <<a href="mailto:abhunkin@uncg.edu">abhunkin@uncg.edu</a>> wrote: <blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> James, Thanks for your wonderful, clear and understandable instructions. They work wonderfully and all my problems are gone. 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. </blockquote><div> Can you tell me where in the wiki you were finding confusing instructions so we can update them? -walter </div><blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> 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. Once again, many thanks. Art Hunkins ----- Original Message ----- From: "James Cameron" <<a href="mailto:quozl@laptop.org" target="_blank">quozl@laptop.org</a>> To: "Art Hunkins" <<a href="mailto:abhunkin@uncg.edu" target="_blank">abhunkin@uncg.edu</a>> Cc: <<a href="mailto:Sugar-devel@lists.sugarlabs.org" target="_blank">Sugar-devel@lists.sugarlabs.org</a>> Sent: Monday, December 27, 2010 11:09 PM Subject: Re: [Sugar-devel] git problems (reprise)<div><div></div><div class="h5"> <blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> On Mon, Dec 27, 2010 at 10:27:26PM -0500, Art Hunkins wrote: <blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> then: git init </blockquote> This is where you went wrong. You've created an entirely new repository instead of cloning the existing one. <blockquote class="gmail_quote" style="margin: 0pt 0pt 0pt 0.8ex; border-left: 1px solid rgb(204, 204, 204); padding-left: 1ex;"> git add <the three changed files - as listed below> git status <everything looks good> the console output then picks up and tells the rest of the story: [liveuser@localhost FileMix.activity]$ git commit -a -m"Version 4 changes: ObjectChooser and Sugar-version ID reworked" [master (root-commit) 3b7e345] Version 4 changes: ObjectChooser and Sugar-version ID reworked 3 files changed, 494 insertions(+), 0 deletions(-) create mode 100755 FileMixReadMe.txt create mode 100755 activity/<a href="http://activity.info" target="_blank">activity.info</a> create mode 100755 filemix.py [liveuser@localhost FileMix.activity]$ git push gitorious@git.sugarlabs.org:filemix/mainline.git To gitorious@git.sugarlabs.org:filemix/mainline.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'gitorious@git.sugarlabs.org:filemix/mainline.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'non-fast-forward' section of 'git push --help' for details. </blockquote> As you guess, the push is where the problem happened. The cause of this error is that you are trying to push from a repository that doesn't have the same history of change. This is because your new local repository is totally unrelated to the remote repository. It is unrelated because it was created with "git init" instead of "git clone". You might do one of these things: 1. clone into a new directory, copy those changed files into it, commit, and push again, 2. understand the difference between the history of your local repository and the remote repository, and adjust it somehow, such as with a merge before a push. I recommend (1) above. I don't recommend (2), although it is possible, it is not necessary. I'm happy to try to help you through this, and I've cloned the 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 prepared to answer questions. Expanding on (1) above: git clone gitorious@git.sugarlabs.org:filemix/mainline.git filemix.git cd filemix.git cp ${THOSE_FILES} . git add FileMixReadMe.txt activity/<a href="http://activity.info" target="_blank">activity.info</a> filemix.py git commit -m 'Version 4 changes: ObjectChooser and Sugar-version ID reworked' git push -- James Cameron <a href="http://quozl.linux.org.au/" target="_blank">http://quozl.linux.org.au/</a> </blockquote> _______________________________________________ Sugar-devel mailing list <a href="mailto:Sugar-devel@lists.sugarlabs.org" target="_blank">Sugar-devel@lists.sugarlabs.org</a> <a href="http://lists.sugarlabs.org/listinfo/sugar-devel" target="_blank">http://lists.sugarlabs.org/listinfo/sugar-devel</a> </div></div></blockquote></div> -- Walter Bender Sugar Labs <a href="http://www.sugarlabs.org">http://www.sugarlabs.org</a>