Yes, I've done this once, and can do it again, but was wondering about
possible collisions. I have changed code in my repo. I have not published
that code. I don't see an easy way to move all of my changes to my work
directory, place those changes in new vocabs in the directory, and change
all reference from the old words to the new words, wherever that might be
necessary. The looks laborious. Completely new stuff in my 'work'
directory is not a collision problem. If I update the entire clean branch
that I checked-out, then I could inadvertently overwrite word-changes made
in place (in the original vocabs). I have not convince myself yet that Git
will keep old changes separate from those from the new update.
Shaping
From: Jim mack [mailto:j...@less2do.com]
Sent: 2010-November-14, 01:14
To: factor-talk@lists.sourceforge.net
Subject: Re: [Factor-talk] Furnace on Windows
>From http://concatenative.org/wiki/view/Factor/Building%20Factor
Building and updating Factor the easy way
Once you have a GIT checkout of the Factor source tree, you can use the
build-support/factor.sh utility to check for updates, and build Factor:
./build-support/factor.sh update
This utility automatically updates your repository, rebuilds the Factor VM,
downloads the latest boot image, and
<http://concatenative.org/wiki/view/Bootstrap> bootstraps Factor. This
utility will work on Windows if Cygwin is installed. However, if Cygwin is
not installed, you can still build Factor using the directions below.
I don't build on windows, but from my unix host this seems to work like a
charm.
On Sat, Nov 13, 2010 at 8:42 PM, Shaping <shap...@charter.net> wrote:
I have a Windows clean-branch check-out from about two weeks ago.
Slava, your new changes are in only websites.concatenative? I'm studying
the Git help on updating a repository (repository branch?).
file:///C:/Program%20Files%20(x86)/Git%201.7.3.1/doc/git/html/user-manual.ht
<http://201.7.3.1/doc/git/html/user-manual.ht%0d%0aml#Updating-a-repository-
With-git-fetch>
ml#Updating-a-repository-With-git-fetch
I use Git GUI (not the command window), and guess that command "git fetch"
is the same as the Remote=> Fetch From => origin. I did that and got what
maybe the deltas (not sure):
>From git://factorcode.org/git/factor
f0e8593..dbfade1 clean-freebsd-x86-32 -> origin/clean-freebsd-x86-32
f0e8593..dbfade1 clean-freebsd-x86-64 -> origin/clean-freebsd-x86-64
ace41a6..dbfade1 clean-linux-x86-32 -> origin/clean-linux-x86-32
f0e8593..dbfade1 clean-linux-x86-64 -> origin/clean-linux-x86-64
f0e8593..9948004 clean-macosx-x86-32 -> origin/clean-macosx-x86-32
f0e8593..9948004 clean-macosx-x86-64 -> origin/clean-macosx-x86-64
f0e8593..dbfade1 clean-openbsd-x86-32 -> origin/clean-openbsd-x86-32
f0e8593..9948004 clean-openbsd-x86-64 -> origin/clean-openbsd-x86-64
5cc7ac4..0939515 clean-winnt-x86-32 -> origin/clean-winnt-x86-32
f0e8593..9948004 clean-winnt-x86-64 -> origin/clean-winnt-x86-64
f0e8593..f6a562a master -> origin/master
Hitting F5 in the Git GUI, though, doesn't show any changes in my repo
directories; so that command must not be doing what I suppose it is.
If you have work in progress in several vocab directories (shown in
"Unstaged Changes"), how do you protect those from possible overwrite,
before you commit them? My 'work' directory work is always safe, but not so
for the other directories.
Another possibility is to check-out again the same Tracking Branch, but this
may not be necessary. I am just now reading all of the Git Help starting
from the beginning, but I thought I would seek a few basic guidelines here,
as well, so that I could update my repo now, and test the web stuff. I
suspect most Git users do mostly the same four or five operations,
repeatedly, to maintain their repo.
Shaping
-----Original Message-----
From: Slava Pestov [mailto:sl...@factorcode.org]
Sent: 2010-November-13, 18:34
To: factor-talk@lists.sourceforge.net
Subject: [Factor-talk] Furnace on Windows
Hi all,
I've fixed Furnace to work when SSL is not available, so it should
work on Windows now. Try this for example:
USE: websites.concatenative
init-testing
start-website
Then navigate to http://localhost:8080.
Slava
----------------------------------------------------------------------------
--
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
