xes_ has quit [Read error: Connection reset by peer]
xes__ has joined #neo900
Kero has quit [Quit: upgrade]
Kero has joined #neo900
bl33d15 has joined #neo900
infobot has quit [Ping timeout: 248 seconds]
threebar` has joined #neo900
threebar has quit [Ping timeout: 240 seconds]
bl33d15 has quit [Ping timeout: 248 seconds]
xes__ is now known as xes
ArturShaik has joined #neo900
freemangordon has joined #neo900
bl33d15 has joined #neo900
bl33d15 has quit [Ping timeout: 240 seconds]
bl33d15 has joined #neo900
rhn has joined #neo900
rhn has quit [Changing host]
rhn has joined #neo900
Kabouik_ has quit [Ping timeout: 240 seconds]
<ceene>
Joerg-Neo900: i guess what you basically want is to place yourself in the same place as metacollin is right now on the repo
<ceene>
you just have to git checkout metacollin-branch
<ceene>
and you'll see the same state as he does, whenever he pushes, you can just pull
<ceene>
if you want, you could mage a big diff between master branch and his branch, via git diff master (or git diff metacollin-branch if you're on master)
<ceene>
i'd recommed you set your prompt to help you visualize which branch you're in at every moment
paulk-gagarine has quit [Remote host closed the connection]
paulk-gagarine has joined #neo900
jonwil has joined #neo900
threebar` has quit [Quit: Leaving]
<Joerg-Neo900>
thanks at all :-)
<Joerg-Neo900>
git help checkout|less -j12 +'/Eventually commit f .* will be deleted'
<Joerg-Neo900>
git is not exactly user friendly in my book
<ceene>
well, it does what you tell him to do
<ceene>
if you don't have a name pointing to a particular commit, that commit is considered lost, because how could you reach it?
<Joerg-Neo900>
yeah, when you *understand* what the semantics of the command you told it to do
<ceene>
you could remember its long hash, but why should you do that when you can just name it, either with a tag or a branch name?
<ceene>
it's the same as when you delete a file on disk
<ceene>
you just mark it as deleted/remove its name
<ceene>
well, in FS terminology, you remove all the entries pointing to its inode
<ceene>
=tag, name, whatever
<Joerg-Neo900>
unlike filesystem there's no obvious way to interact with git. Evidence: mc doesn't even try to offer git views
<Joerg-Neo900>
and in FS terminology, in git I could create an unnamed dir (`mkdir ;`), then create a few files in it (date >a; ls >b), and when I do `cd` (git checkout master) then my files a and b silently get deleted
<Joerg-Neo900>
plus I totally miss the git analog of "ls -l" and a few other commands. Particularly why don't I see a branch, resp which git command I'm missing to see all branches of a repo?
<Joerg-Neo900>
to me it seems like those branches are hidden to me until I git checkout to one of them, for which I need to *know* it's name
<Joerg-Neo900>
git branch -r still fails. You need git fetch before
<Joerg-Neo900>
AIUI
<Joerg-Neo900>
so from git checkout, my journey led me to git branch -r, and now I need to understand git fetch
<Joerg-Neo900>
it seems like always when I try to grok something git, after several hours I end in middle of nowhere (the N'th indirection to yet another detail to learn) and forgot what been the thing I originally intended to accomplish
ossguy has joined #neo900
jkepler has quit [Ping timeout: 252 seconds]
<Joerg-Neo900>
aaah, tig "H"
bl33d15 has joined #neo900
<Joerg-Neo900>
lol, or bash completion FTW: git checkout <TAB>
<sixwheeledbeast>
fetch is simply getting the latest from the remote, think "pull but without merging"
<Joerg-Neo900>
:-D
how900 has quit [Ping timeout: 260 seconds]
<Joerg-Neo900>
anyway I "solved" this by git-clone'ing a new dir and in that dir git-checkout to the new branch
<bencoh>
is it just me or you always end up solving any git issue by git cloning from scratch? :]
<Joerg-Neo900>
I probbaly fail to understand how to use git
<bencoh>
I guess so
<Joerg-Neo900>
or git is simply "not made" for dealing with anything other than (c-)sourcecode environments
<bencoh>
not exactly
<sixwheeledbeast>
But you just end up with two unidentical copies?
<bencoh>
?
<sixwheeledbeast>
sorry identical, if your cloning a repo
<bencoh>
he's basically trashing his local changes yeah
<Joerg-Neo900>
carefully check *which* are those files with 2local changes"!
<Joerg-Neo900>
all auto-generated, possibly by as innocent an operation as opening kicad
<bencoh>
well that's the real issue here actually: kicad might not be VCS-friendly
<Joerg-Neo900>
it isn't
<bencoh>
and/or you probably added to git files that don't belong there
<Joerg-Neo900>
pretty much like nothing except c development is
<bencoh>
like .... -bak file ...
<Joerg-Neo900>
I for sure didn't
<bencoh>
well someone did
<bencoh>
and it's not about "c dev" but more about autogenerated files (usually by UI-driven programs)
<bencoh>
and the fact that you should periodically check your local changes and atomically (when possible) commit
<Joerg-Neo900>
I don't have local changes
<bencoh>
well, in your repositories those files were marked as "untracked"
<bencoh>
but I suppose somebody decided to track them at some point, otherwise I don't think they would be "overwritten" by checkout
<Joerg-Neo900>
sorry, more about git than I wanted to know
<bencoh>
nevermind then :)
<sixwheeledbeast>
How I understand it is those files had been modified locally, you can't checkout with out dropping them or commiting them?
<Joerg-Neo900>
metacollin pushed a branch that I want to look into - that's all
<Joerg-Neo900>
and I guess I will demand for a branch merge every other day
<Joerg-Neo900>
we don't really need a branch there, except metacollin locally maybe
jonwil has quit [Quit: ChatZilla 0.9.93 [SeaMonkey 2.48/20170707010522]]
<Joerg-Neo900>
so he may merge locally once a day, or every other day, and then push to server repo
<Joerg-Neo900>
btw that's also the reason the public git doesn't show any progress/life
<Joerg-Neo900>
metacollin: could you please merge to master(?) (the default ee-full repo) 0.5 to 1 time per day?
<Joerg-Neo900>
those merges should show up in public git then, not by content as far as layout files are involved, but the commit comments will
<Joerg-Neo900>
sixwheeledbeast: yes, that's what I think is happening
<Joerg-Neo900>
they are not tracked in master but seems they are tracked in branch
<Joerg-Neo900>
it's probably fine to have a branch that has *all* files, just in case we miss some important file in master (via gitignore) that we didn't realize is actually keeping project relevant data, but generally I'd prefer to pull from master
bl33d15 has quit [Ping timeout: 240 seconds]
<Joerg-Neo900>
another rationale for layout branch was to keep master's commit logs tidy. We need to re-adjust balance between tidy and real-time informative here
<Joerg-Neo900>
particularly since public git only shows master, no branches
ArturShaik has quit [Ping timeout: 248 seconds]
how900 has joined #neo900
how900 has quit [Changing host]
how900 has joined #neo900
xmn has joined #neo900
ArturShaik has joined #neo900
Kabouik has quit [Ping timeout: 240 seconds]
Kabouik has joined #neo900
bl33d15 has joined #neo900
jkepler has joined #neo900
jkepler1 has joined #neo900
jkepler has quit [Ping timeout: 240 seconds]
jkepler1 is now known as jkepler
bl33d15 has quit [Ping timeout: 240 seconds]
Kabouik_ has joined #neo900
Kabouik has quit [Read error: Connection reset by peer]
<xmn>
well it good news they are working together, no?
<xmn>
thx for the link, btw
<pigeons>
xmn: I guess, but its more stuff that ignores the real issues needed to accomplish the stated goals, and purism has a history of that too
<xmn>
yeah, I agree
bl33d15 has quit [Ping timeout: 264 seconds]
<xmn>
As much as I not a huge fan of purism. I happy they are trying it.
arnaudj has quit [Ping timeout: 240 seconds]
Pali has joined #neo900
<Joerg-Neo900>
sure
<xmn>
:D
<Joerg-Neo900>
a KDE phone centric release can't hurt anyways
<Joerg-Neo900>
though we already have an excellent phone OS: maemo
<xmn>
I mean the best case it bring more eye to other project like this one. Worst case it shows people not to trust opensource/small project with their money and time :(.
<Joerg-Neo900>
indeed
<xmn>
Yeah I enjoy maemo. But alway got to keep a breast of options ;)
Pali has quit [Ping timeout: 240 seconds]
arnaudj has joined #neo900
threebar` has joined #neo900
jkepler has quit [Ping timeout: 240 seconds]
ArturShaik has quit [Ping timeout: 255 seconds]
jkepler has joined #neo900
threebar` has quit [Ping timeout: 260 seconds]
Kabouik- has joined #neo900
Kabouik_ has quit [Ping timeout: 248 seconds]
arnaudj has quit [Ping timeout: 240 seconds]
arnaudj has joined #neo900
jkepler1 has joined #neo900
jkepler has quit [Ping timeout: 252 seconds]
jkepler1 is now known as jkepler
threebar` has joined #neo900
threebar` has quit [Ping timeout: 248 seconds]
arnaudj has quit [Ping timeout: 260 seconds]
arnaudj has joined #neo900
arnaudj has quit [Remote host closed the connection]
arnaudj has joined #neo900
jkepler has quit [Ping timeout: 240 seconds]
threebar` has joined #neo900
threebar` has quit [Ping timeout: 260 seconds]
arnaudj has quit [Quit: arnaudj]
rhn has quit [Ping timeout: 260 seconds]
jonsger has joined #neo900
ecloud has quit [Remote host closed the connection]
ecloud has joined #neo900
ecloud has quit [Read error: Connection reset by peer]
ecloud has joined #neo900
ecloud has quit [Read error: Connection reset by peer]