There is a subfolder in my work folder called .git This is what I think of
as the repository.
Yes. But this is a source of some confusion. I think of the .git directory
as the repo, too, and the directory that includes it as the working
directory, into which the compressed code in .git is uncompressed and made
ready for a developer's use. So we have the working directory whose
contents are reconstituted from the .git directory inside it. The .git
itself is not one of these reconstituted folders, obviously, because it is
the source. You can add code to a .git directory always in compressed form
with commands clone, fetch, pull, and push.
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.
Someone please check the following statements for accuracy:
A == remote repo
B == local repo
C == local working directory including by definition the local repo (.git
directory)
1) clone copies compressed files from a remote repo to a local repo, creates
remote-tracking branches for each branch in the remote repository, and
creates and checks out an initial branch forked from the cloned repository's
currently active branch. A -> B -> C.
2) checkout updates files in the working directory to match the version in
the specified branch of the repo. By default, the current branch is set to
the specified branch. B -> C.
3) fetch only copies compressed files from a remote repo to a local repo. A
-> B.
3) pull fetches and then merges the fetched code into the current branch.
A -> B. No check-out is done; so how does the repo code get into the
working directory (C)? In practice, I think our factor.cmd does a pull that
puts code in the working directory, which is where the compiler goes for its
source during the build. So this is not clear to me. Perhaps I don't
understand what merge means.
5) merge replays changes from a specified branch into the current branch.
The changes are those resulting from commits in the specified branch since
it diverged from the current branch. This looks like a local, repo-only
operation: B -> B.
4) push copies compressed files from a local repo to a remote one, to update
it. B -> A
Shaping
On Sun, Nov 14, 2010 at 3:45 PM, Shaping <shap...@charter.net> wrote:
Yes. By "directory" below is meant place of the "repo", whether a local
place or a remote one.
Shaping
-----Original Message-----
From: William Tanksley, Jr [mailto:wtanksle...@gmail.com]
Sent: 2010-November-14, 17:42
To: factor-talk@lists.sourceforge.net
Subject: Re: [Factor-talk] Furnace on Windows
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 "distributed" version control system,
as opposed to CVS and Subversion, both of which are centralized.
> Shaping
-Wm
----------------------------------------------------------------------------
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Factor-talk mailing list
Factor-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/factor-talk
----------------------------------------------------------------------------
--
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Factor-talk mailing list
Factor-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/factor-talk
--
Jim
"I'm for extending the working Medicare program for our seniors all the way
back to contraception, so Americans can concentrate on living their lives
without fear of changing a job, going bankrupt from deductibles or fighting
HMO bureaucracy."
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Factor-talk mailing list
Factor-talk@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/factor-talk
