the work repository is a separate git base from the larger code base. When
you are in factor\work, git knows about your personal repository (assuming
you have one set up) but when you are in factor, it knows about where you
cloned from, but will ignore work as that's a personal distribution.
On
http://book.git-scm.com/3_basic_branching_and_merging.html
you can also do
1 git branch playing
2 git checkout playing
3 -- perform changes
4 git checkout master
-- you're back to level 2, but 3 is avail
How is 3 available? Is it version separately from the master you just
restored
the work repository is a separate git base from the larger code base.
I know. This is the result of the cloning.
When you are in factor\work, git knows about your personal repository
(assuming you have one set up) but when you are in factor, it knows about
where you cloned from, but will
On Sun, Nov 14, 2010 at 9:55 PM, Shaping shap...@charter.net wrote:
Right now I need to recover from a fetch origin.
You don't need to recover from a 'fetch'. What that does is it
downloads the stuff you don't yet have and stores it internally in a
'remote' branch. It makes no changes at all to
On Sun, Nov 14, 2010 at 10:01 PM, Shaping shap...@charter.net wrote:
I know. I'm concerned about possible collisions with modified stock code.
I think the point Chris is making in his step 2 is that these changes need
to be committed, first, but he did not mention old directories , only new
Well, that was a little unexpected. All files in the commit window are
committed under a comment I wrote for just one of them. I had only one file
selected. I guess you're expected to commit one at a time if you need to
individuate comments, which I do. Now I need to roll-back the last
...Okay you can Commit = Ammend Last Commit to fix mistakes like this...
Shaping
From: Shaping [mailto:shap...@charter.net]
Sent: 2010-November-14, 03:44
To: factor-talk@lists.sourceforge.net
Subject: Re: [Factor-talk] Git GUI commit
Well, that was a little unexpected. All
What is deploy.factor all about? It looks like a list of vocabs to load
before building the exe. Do we usually commit stuff like this? Probably
not.
Shaping
From: Shaping [mailto:shap...@charter.net]
Sent: 2010-November-14, 03:44
To: factor-talk@lists.sourceforge.net
Subject: Re:
On Sun, Nov 14, 2010 at 10:40 PM, Shaping shap...@charter.net wrote:
Are you saying that fetch downloads a model of some remote committed code,
so that I can somehow view an abbreviated representation of that code, so
that I can later, at my convenience, select some or all of it and then
Hi everyone,
what do you think about removing the model slot from arrow models?
It looks redundant with the dependencies slot to me.
You can take a look at the attached patch that removes it (unit-tests
pass with this patch)
Jon
From 75a9483dc8df5f24ee94118349cf303531354375 Mon Sep 17 00:00:00
There's a lot going on, so context is difficult here, but I was trying to go
back in time before you made changes, and suggest when working on Factor
main code, you make changes *in a branch,* sync with the larger community
in the main trunc, not a branch, then integrate your stuff by merging
I'm running ubuntu 10.4 lts, and just refreshed factor rebuilt using
the ./build-support/factor.sh
update method at about 10pm Saturday. The last time I build was 2 months
ago, and the code has changed, but runs on both pc mac using the binary
downloads as recent as a week ago.
On Sun, Nov 14,
There's a lot going on, so context is difficult here, but I was trying to go
back in time before you made changes, and suggest when working on Factor
main code, you make changes *in a branch,* sync
sync means to resolve conflicting changes? I am reading the Git
documentation from
You are managing interaction between three places, and I'm not great on
using the best words, so listen for the themes as I explain my working metal
model for git :) . A) The remote place, B) your local git version of that,
and C) your physical file layout. Commands like fetch work between A
Shaping shap...@charter.net wrote:
If you have a personal git host somewhere, and there are free ones, try
making two clones of the same little folder
I thought one clones only a repo.
Every working directory cloned from a repo is itself a repo. This is
why git is a decentralized and
Some of the doc says that your default branch is master. This is not
correct. I just did a git status and see Not currently on a branch
What they mean is when you first clone a repository you get a default
branch called 'master'. And this is the default checked out branch.
It's
On Mon, Nov 15, 2010 at 12:55 PM, Shaping shap...@charter.net wrote:
So Git GUI makes the master branch by default, but does not put you on it.
Why is that a good thing to do?
I have no idea, sorry. I stick with the command line.
Chris.
--
http://www.bluishcoder.co.nz
I may have broken that. I will reclone.
I'm using both Git Bash and Bit GUI, the first to check the behavior of the
second.
Shaping
-Original Message-
From: Chris Double [mailto:chris.dou...@double.co.nz]
Sent: 2010-November-14, 17:59
To: factor-talk@lists.sourceforge.net
Subject:
Factor.cmd can take clean or latest. I want the bignum fix, which I see
is in branch latest. I want the recent web server fix from Slava, but I
don't see it. Can someone tell me what branch this is in, or what the fix
is called?
Shaping
Pull incorporates changes from a remote repository into the current branch.
What happens if you don't have a current branch? I just ran the factor.cmd,
but I am on (no branch). Do I have to merge that stuff into master? The
strangeness here is that I was never on master, which apparently is
Okay, I flushed my Factor repo, saving off to the desktop (for now) two
changed clean-branch files, and a few new work vocabs/exercises.
I cloned the remote Factor repo: git://factorcode.org/git/factor.git.
The resulting local repo clone is about 116 MB. Its .git subdirectory is
about 64 MB.
There is a subfolder in my work folder called .git This is what I think of
as the repository. When you do a git add or commit, it's going between
these two places. When you do a clone, push, pull, or fetch you're going to
some remote place as well.
On Sun, Nov 14, 2010 at 3:45 PM, Shaping
On Sun, Nov 14, 2010 at 2:45 PM, Shaping shap...@charter.net wrote:
There's a lot going on, so context is difficult here, but I was trying to
go back in time before you made changes, and suggest when working on Factor
main code, you make changes *in a branch,* sync
sync means to resolve
It seems as if we swayed away from the main topic a wee bit here.
Quite nice git tutorial forming though :)
On Nov 15, 2010, at 3:24 AM, Jim mack wrote:
There is a subfolder in my work folder called .git This is what I think of
as the repository. When you do a git add or commit, it's
Hi John/all.
I still have some Git exercises and maintenance to do tonight, but I tripped
over this http://planet.factorcode.org/ and want to see where it might lead.
The syntax highlighting is interesting to me. I'm wondering whether we can
change the Listener GUI into a color vocab browser
On Sun, Nov 14, 2010 at 5:55 PM, Shaping shap...@charter.net wrote:
git branch
displays
(no branch)
master
Possibly helpful: not-on-a-branch is a place you can land partway
through a rebase / merge process.
It can be painful to get your head around the git way of doing things,
if you
26 matches
Mail list logo
