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 ignore work as that's a personal
distribution.
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
ones.
Shaping.
On Sun, Nov 14, 2010 at 12:17 AM, Shaping <shap...@charter.net> wrote:
I only know the command line so I'll give you command line tips and
you can translate them to equivalent GUI commands.
1) Clone the factor respository
git clone git://factorcode.org/git/factor.git
2) In this repository you make your own changes, including adding
stuff to the work directory, editing files, etc. Now you want to save
those in git so you can update safely.
git add work/my-new-vocab/*
git add any-other-new-files
The problem: what if I have editing existing files, and there are no new
files in the vocab root directories, only changed existing files?
got commit -m "This is a message describing my changes"
3) Now you want to retrieve the latest changes from the factor repository:
git fetch origin
Oops. I did not do the last line of (2) before I did (3). I can identify
the menu item for (3). It reads the same. I cannot identifiy an "add" menu
item, except under the Remote menu, which I don't think is what we want
here.
Nothing is apparently any different in my repo, for having done the fetch.
Does the fetched delta show up the same way my own edits do. Maybe not. If
so, that would explain why I don't see them in Unstaged changes (which are
just my manually created mods?).
4) Note that step (3) only retrieved the changes. It has made no
changes to your actual physical source code. To update that, assuming
you've done (2):
git rebase origin/master
Replace 'origin/master' with 'origin/clean-...' or whatever branch you
are using from the factor repository. Probably master as that's the
default. If there is a clash between your changes and the factor
repository you'll get the chance to edit your changes and fix the
clash. You can then do:
git add ...file-containing-fixes
git rebase --continue
Or, if you are panicing, you can abort the rebase and be back to just
a repository with your changes:
git rebase --abort
These steps will ensure that your changes always are based on top of
the latest factor repository changes
That's what I want, but I don't see the mapping yet to the menu items. I'll
look around for the GUI help. The default help doesn't mention the GUI,
only the command line.
, making it easy to use 'git log'
and friends to see what your changes are, and to contribute them back
to factor one day.
I just realized that work does not show in my Unstaged Changes. Does anyone
here use Git GUI on Windows?
...
Apparently, adding (or almost adding) is the act of moving from the
"Unstaged" to the "Staged Changes (Will Commit)" box. This publishes to my
clone, not to the original repo I cloned, correct?
...
Why doesn't my work directory show in Unstaged Changes? There is plenty of
new work there.
...
So I'm not sure how to do (2) yet.
Shaping
----------------------------------------------------------------------------
--
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
