Puppy Linux Discussion Forum Forum Index Puppy Linux Discussion Forum
Puppy HOME page : puppylinux.com
"THE" alternative forum : puppylinux.info
 
 FAQFAQ   SearchSearch   MemberlistMemberlist   UsergroupsUsergroups   RegisterRegister 
 ProfileProfile   Log in to check your private messagesLog in to check your private messages   Log inLog in 

The time now is Fri 24 Oct 2014, 20:19
All times are UTC - 4
 Forum index » Advanced Topics » Puppy Projects
Woof at Github
Moderators: Flash, JohnMurga
Post_new_topic   Reply_to_topic View_previous_topic :: View_next_topic
Page 5 of 14 Posts_count   Goto page: Previous 1, 2, 3, 4, 5, 6, 7, ..., 12, 13, 14 Next
Author Message
Karl Godt


Joined: 20 Jun 2010
Posts: 3972
Location: Kiel,Germany

PostPosted: Sat 16 Nov 2013, 15:56    Post_subject:  

Ibidem wrote:
Karl Godt wrote:
01micko wrote:
woof-CE should be ready to build from now. There were some teething problems migrating the repository from fossil to git, I committed the fixes to the testing branch pending a sanity check then will merge with master. Karl, you might be interested in merging the changes into your repository.

Yeah, Mick , I should do .
But am a little unsure how to do this :

I would try with whatever git command to pull the main (master ?) repo into my local repo on the current partition , that likely would overwrite my files (?) and after that pull in my fork into my local repo on the current partition, that would overwrite the files overwritten by the merge of the main repo ..

Suggestions Question


I'm assuming you haven't created any branches or commited anything.

Code:
 git diff #check if anything has been changed
 #if you did change something, save it.
git checkout -b local
git commit -a -m "My changes"
git checkout master
git checkout -b upstream #create and check out a new branch, named "upstream"
git pull git://github.com/... master #download and merge


If all goes well, you should be able to merge "upstream" into "local".
Ask for details if that's not clear enough.

Ibidem, thank you very much !
For clarify : I think I clicked on the "fork" button in the firefox webbrowser,
could somehow create a github account, and did
Code:
/usr/git/bin/git clone https://github.com/puppylinux-woof-CE/woof-CE
/usr/git/bin/git clone https://github.com/KarlGodt/woof-CE

puppylinux-woof-CE/woof-CE is located @ /root/WOOF.REPOS.D/WOOF.GIT

and

KarlGodt/woof-CE is located @ /root/WOOF.REPOS.D/KarlGodtWOOF.GIT

on the current partition

and I am only working in my own directory :
# pwd
/root/WOOF.REPOS.D/KarlGodtWOOF.GIT/woof-CE

Ibidem, I am committing to my Fork on github already like this last commit :
Code:
git commit -am "pup_event_backend_modprobe AND pupBOOTfunctions :
> Cleaned up my code from commit e8efbe335ac67eb4db469ac867e3934ea3fa43c7."
[master 82c4417] pup_event_backend_modprobe AND pupBOOTfunctions : Cleaned up my code from commit e8efbe335ac67eb4db469ac867e3934ea3fa43c7.
 2 files changed, 2 insertions(+), 84 deletions(-)
[20:58 0 /bin/bash 18156 46 woof-CE ]
[puppypc]# git push origin

Then comes a bunch of translated nonsense about warning: 'push.default'
but finally it uploads :
Code:
Counting objects: 17, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 797 bytes | 0 bytes/s, done.
Total 9 (delta 8), reused 0 (delta 0)
To https://github.com/KarlGodt/woof-CE
   e8efbe3..82c4417  master -> master
[20:58 0 /bin/bash 18156 47 woof-CE ]

_________________
«Give me GUI or Death» -- I give you [[Xx]term[inal]] [[Cc]on[s][ole]] .
Macpup user since 2010 on full installations.
People who want problems with Puppy boot frugal Razz
Back to top
View user's profile Send_private_message Visit_website 
Karl Godt


Joined: 20 Jun 2010
Posts: 3972
Location: Kiel,Germany

PostPosted: Sat 16 Nov 2013, 16:44    Post_subject:  

Reading here : http://blog.mikepearce.net/2010/05/18/the-difference-between-git-pull-git-fetch-and-git-clone-and-git-rebase/
I did now a
Code:
git branch -a
* master
  shutdown
  remotes/origin/HEAD -> origin/master
  remotes/origin/master

The shutdown branch was created by
Code:
git branch shutdown

while I was playing with the branch command, but have not used that branch and
Code:
ls -A .git/branches

is empty .
Back to top
View user's profile Send_private_message Visit_website 
Karl Godt


Joined: 20 Jun 2010
Posts: 3972
Location: Kiel,Germany

PostPosted: Sat 16 Nov 2013, 18:23    Post_subject:  

Seems solved ..

Code:
git remote add puppylinux-woof-CE https://github.com/puppylinux-woof-CE/woof-CE
git remote -v

origin https://github.com/KarlGodt/woof-CE (fetch)
origin https://github.com/KarlGodt/woof-CE (push)
puppylinux-woof-CE https://github.com/puppylinux-woof-CE/woof-CE (fetch)
puppylinux-woof-CE https://github.com/puppylinux-woof-CE/woof-CE (push)
Code:
git fetch puppylinux-woof-CE

remote: Counting objects: 657, done.
remote: Compressing objects: 100% (207/207), done.
remote: Total 392 (delta 209), reused 301 (delta 119)
Empfange Objekte: 100% (392/392), 62.45 KiB | 0 bytes/s, done.
Löse Unterschiede auf: 100% (209/209), vervollständigt mit 115 lokalen Objekten.
Von https://github.com/puppylinux-woof-CE/woof-CE
* [neuer Branch] master -> puppylinux-woof-CE/master
* [neuer Branch] testing -> puppylinux-woof-CE/testing
Von https://github.com/puppylinux-woof-CE/woof-CE
* [neues Tag] 0.1 -> 0.1
* [neues Tag] woof-CE-0.1 -> woof-CE-0.1
Code:
git branch -r

origin/HEAD -> origin/master
origin/master
puppylinux-woof-CE/master
puppylinux-woof-CE/testing
Code:
git remote show origin

* Remote-Repository origin
URL zum Abholen: https://github.com/KarlGodt/woof-CE
URL zum Versenden: https://github.com/KarlGodt/woof-CE
Hauptbranch: master
Remote-Branch:
master gefolgt
Lokaler Branch konfiguriert für 'git pull':
master führt mit Remote-Branch master zusammen
Lokale Referenz konfiguriert für 'git push':
master versendet nach master (aktuell)
Code:
LC_ALL=C git remote show puppylinux-woof-CE

* remote puppylinux-woof-CE
Fetch URL: https://github.com/puppylinux-woof-CE/woof-CE
Push URL: https://github.com/puppylinux-woof-CE/woof-CE
HEAD branch (remote HEAD is ambiguous, may be one of the following):
master
testing
Remote branches:
master tracked
testing tracked
Local ref configured for 'git push':
master pushes to master (local out of date)

...
Made a backup of my local repo
...
Code:
git pull puppylinux-woof-CE master

Von https://github.com/puppylinux-woof-CE/woof-CE
* branch master -> FETCH_HEAD
Entferne woof-code/rootfs-skeleton/usr/sbin/xrandrshell-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/timezone-set-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/partviewOLD
Entferne woof-code/rootfs-skeleton/usr/sbin/mailto.sh
Entferne woof-code/rootfs-skeleton/usr/sbin/importfrompuppy1
Entferne woof-code/rootfs-skeleton/usr/sbin/gaimshell
Entferne woof-code/rootfs-skeleton/usr/sbin/gaim-autosetup.sh
Entferne woof-code/rootfs-skeleton/usr/sbin/countrywizard-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/chooselocale-OLD
Entferne woof-code/rootfs-skeleton/usr/sbin/burniso2cdTEST
Entferne woof-code/rootfs-skeleton/usr/local/video_upgrade/video_upgrade_wizard-OLD
Entferne woof-code/rootfs-skeleton/usr/local/bin/xdg-open-OLD
Entferne woof-code/rootfs-skeleton/sbin/gtklogfileviewer
Entferne woof-code/rootfs-skeleton/etc/protocols-OLD
Entferne woof-code/rootfs-skeleton/etc/ld.so.cache
Entferne woof-code/rootfs-skeleton/etc/inittabPREV1
Merge made by the 'recursive' strategy.
kernel-kit/DOTconfig | 936 ++++++---
kernel-kit/README | 9 +-
kernel-kit/build.conf | 24 +-
kernel-kit/build.sh | 107 +-
kernel-kit/configs_extra/DOTconfig-3.10.9-slacko | 5352 ++++++++++++++++++++++++++++++++++++++++++++++++
woof-code/boot/makeinitrdgz.sh | 0

+++ 800 more lines , most of them were
mode change 100644 => 120000 woof-code/rootfs-skeleton/usr/share/sounds/illegal_move.ogg
alike .

My files apparently not affected .

[
Rxvt*saveLines: 10000
HISTSIZE=100000
HISTFILESIZE=200000
]
Back to top
View user's profile Send_private_message Visit_website 
Ted Dog


Joined: 13 Sep 2005
Posts: 2368
Location: Heart of Texas

PostPosted: Sat 16 Nov 2013, 19:39    Post_subject:  

great would like to contribute my mulisession changes could someone with a creditcard open a git acct for me. why do rhey ask for it on free accts. If you need a different host I have about 5G of space avail on puppylinux.net unused
Back to top
View user's profile Send_private_message 
01micko


Joined: 11 Oct 2008
Posts: 7835
Location: qld

PostPosted: Sat 16 Nov 2013, 19:55    Post_subject:  

Ted Dog, you don't need a credit card, just open an account. ( i didn't need one)
_________________
Woof Mailing List | keep the faith Cool |
Back to top
View user's profile Send_private_message Visit_website 
Ted Dog


Joined: 13 Sep 2005
Posts: 2368
Location: Heart of Texas

PostPosted: Sat 16 Nov 2013, 20:02    Post_subject:  

so that is good about how many meg download does it need to build a working local wolf. its almost time for my yearly equipment check// space heater compiling farm setup. Very Happy
Back to top
View user's profile Send_private_message 
Ibidem

Joined: 25 May 2010
Posts: 501
Location: State of Jefferson

PostPosted: Sat 16 Nov 2013, 20:15    Post_subject:  

@Karl: I guess you figured it out yourself, but here's how I would have done it...

You diverged at commit 99b66d.

Code:
git checkout 99b66d #will warn about "detached head"
git checkout -b upstream
git pull https://github.com/puppylinux-woof-CE/woof-CE
git checkout master
git merge upstream


@Ted Dog:
1: Github costs only if you want to have "private" repositories hosted there. The signup interface is somewhat confusing, I will say.

Ted Dog wrote:
its almost time for my yearly equipment check// space heater compiling farm setup.

LOL.
Back to top
View user's profile Send_private_message 
Karl Godt


Joined: 20 Jun 2010
Posts: 3972
Location: Kiel,Germany

PostPosted: Sat 16 Nov 2013, 21:15    Post_subject:  

Ibidem, after reading some manpages, I tried this :

[puppypc]# git checkout −b puppylinux-woof-CE puppylinux-woof-CE/master

error: pathspec '−b' did not match any file(s) known to git.
error: pathspec 'puppylinux-woof-CE' did not match any file(s) known to git.
error: pathspec 'puppylinux-woof-CE/master' did not match any file(s) known to git.

Question

[puppypc]# git --version
git version 1.8.5-rc1
Back to top
View user's profile Send_private_message Visit_website 
raffy

Joined: 25 May 2005
Posts: 4779
Location: Manila

PostPosted: Sat 16 Nov 2013, 21:30    Post_subject: url  

The test build Slacko 5.6.0.5 boots and connects flawlessly in my AMD E-350 emachines laptop.

I got the ISO from
https://archive.org/download/Puppy_Linux_Slacko/slacko-5.6.0.5.iso

_________________
Puppy user since Oct 2004. Want FreeOffice? Get the sfs (English only).

Edited_time_total
Back to top
View user's profile Send_private_message 
Karl Godt


Joined: 20 Jun 2010
Posts: 3972
Location: Kiel,Germany

PostPosted: Sat 16 Nov 2013, 22:37    Post_subject:  

Quote:
commit 99b66de00ce8956ffa2d4c261d4474181e9724be
Author: mavrothal <mavrotal@yahoo.com>
Date: Wed Nov 13 15:58:06 2013 +0200

Revert "Replace EMPTYDIRMARKER with .gitignore"

This reverts commit d1adca562538de8b3fd38bdedc698c02b17a7e85.

git --version
git version 1.6.4.1

git checkout 99b66d
ignoring REUC extension
Note: moving to '99b66d' which isn't a local branch
If you want to create a new branch from this checkout, you may do so
(now or later) by using -b with the checkout command again. Example:
git checkout -b <new_branch_name>
HEAD is now at 99b66de... Revert "Replace EMPTYDIRMARKER with .gitignore"

This would be a "total" reset .. ?

git checkout -b upstream
Switched to a new branch 'upstream'

Finally -b option works -> seems my new git is buggy .. ?

git pull https://github.com/puppylinux-woof-CE/woof-CE
error: The requested URL returned error: 403 Forbidden while accessing https://github.com/puppylinux-woof-CE/woof-CE/info/refs

fatal: HTTP request failed

Evil or Very Mad
Back to top
View user's profile Send_private_message Visit_website 
mavrothal


Joined: 24 Aug 2009
Posts: 1698

PostPosted: Sun 17 Nov 2013, 07:00    Post_subject: woof-CE-derived pupplets  

It is very exciting that people start building woof-CE-based puppies.
However, I think that if all of them are also discussed in this thread will be chaotic and counter productive.

I would suggest woof-CE pupplets to open their own thread and just announced here like this:
"New woof-CE <pupplet-name> in this thread: [url]puppy_forum_urll[/url]"

I'll do my best to update the first post with these links to the various pupplet threads.

Lets keep this thread focused on woof and/or github matters

_________________
Kids all over the world go around with an XO laptop. They deserve one puppy (or many) too Very Happy
Back to top
View user's profile Send_private_message 
Ted Dog


Joined: 13 Sep 2005
Posts: 2368
Location: Heart of Texas

PostPosted: Sun 17 Nov 2013, 10:31    Post_subject:  

please do not start spliting off threads it gets much harder to follow development efforts with stuff spread about under various categories. We do need a full forum for wolf like with multisessions. with a how to setup and work wolf with git sticky. Please let others post efforts under this thread until a better home can be arranged, otherwise efforts will just get lost.
Back to top
View user's profile Send_private_message 
Karl Godt


Joined: 20 Jun 2010
Posts: 3972
Location: Kiel,Germany

PostPosted: Sun 17 Nov 2013, 11:12    Post_subject: Re: woof-CE-derived pupplets  

mavrothal wrote:
It is very exciting that people start building woof-CE-based puppies.
However, I think that if all of them are also discussed in this thread will be chaotic and counter productive.

I would suggest woof-CE pupplets to open their own thread and just announced here like this:
"New woof-CE <pupplet-name> in this thread: [url]puppy_forum_urll[/url]"

I'll do my best to update the first post with these links to the various pupplet threads.

Lets keep this thread focused on woof and/or github matters

+1 !
I am actually using Mick's mailing list now for woof or github matters.
But responses like the ones from Ibidem are much appreciated .


@TedDog : Short announcements with a link to the thread would suffice . But of course, many would still respond to builds in threads with just a link to the main thread . But probably not so many any more .
Back to top
View user's profile Send_private_message Visit_website 
Ted Dog


Joined: 13 Sep 2005
Posts: 2368
Location: Heart of Texas

PostPosted: Sun 17 Nov 2013, 12:01    Post_subject:  

not for me it would not, this site gets very fragmented, your stuff is spreadout all over the place. like this thread could not find it. expected it to be under cutting edge or advanced but no, puppy projects! makes no sense to place it here! Shocked
I know we try to keep from thread topic spreading but with the native language issues we already have a topic naming and placement problem. So please keep it together for a month or two.
Back to top
View user's profile Send_private_message 
wanderer

Joined: 20 Oct 2007
Posts: 230

PostPosted: Sun 17 Nov 2013, 13:54    Post_subject:  

hello everyone
i have posted this on the community edition thread
please consider submitting a candidate
or at least an opinion
thanks
wanderer


hi community edition puppy fans

now that the experts are working on a new woof
the real development for the community edition has moved there

i am asking anyone that is making new puppies
with the new woof system
to consider making a community edition candidate
and posting a link to it
on the community edition thread

this should speed development up substantially
and also give the community
a variety of puppy versions to choose from
with so much talent around
we should not limit ourselves
to just one community edition version

remember the community edition is a joint effort
of the whole puppy community

i will continue to work
on my community edition candidate
but since i am not an expert
it will take me a while
to get to something useful

post your thoughts
(and your community edition candidates)

thanks

wanderer
Back to top
View user's profile Send_private_message 
Display_posts:   Sort by:   
Page 5 of 14 Posts_count   Goto page: Previous 1, 2, 3, 4, 5, 6, 7, ..., 12, 13, 14 Next
Post_new_topic   Reply_to_topic View_previous_topic :: View_next_topic
 Forum index » Advanced Topics » Puppy Projects
Jump to:  

Rules_post_cannot
Rules_reply_cannot
Rules_edit_cannot
Rules_delete_cannot
Rules_vote_cannot
You cannot attach files in this forum
You can download files in this forum


Powered by phpBB © 2001, 2005 phpBB Group
[ Time: 0.1160s ][ Queries: 13 (0.0062s) ][ GZIP on ]