readme-arails

README
<gena@analograils.com>

Introduction
------------
This repository is intended to keep gnucap Arails development snapshots and releases.

Workflow
--------
1) make modifications which you want to have in gnucap-arails
2) provide test cases for those modifications
3) when new version of gnucap-main is issued - make merge

as a result - this repository will always contain latest gnucap-arails

commits, which will be made after merge with new gnucap-main will be named like "gnucap-2009-08-11-merged"

Notes
-----
This repository shall be isolated from others and shall be kept as close as possible to Al's repository.
Any additional files (like specific build scripts, test cases) better keep in another repository 
(at least so far). 

Reason for that - good to have commits, which refer to changes in sources only and not overcrowd change 
log with irrelevant code.


commands:
---------
1) 
at gnucap-main working repo
apply new gnucap
add version number
git add <all files>
git commit -m "version number"
git push

2) 
at gnucap arails working repo
git-pull gnucap-main HEAD
if any conflicts {
     resolve
     git add <files>
     git commit -m "<commit comment>"
     }
git push

as a result of two pit-push both repositories contain actual code

important things
----------------
1)  check if in .git/config present something like
[remote "gnucap-main"]
	url = ssh://git.gnucapplus.org/srv/gnucapplus/git/gnucap-main.git
	fetch = +refs/heads/*:refs/remotes/gnucap-main/*

it was added by 
>git add remore gnucap-main ssh://git.gnucapplus.org/srv/gnucapplus/git/gnucap-main.git
and have to be present.
if not - add it

2) >git fetch gnucap-main
will fetch newest gnucap-main chnages

3)  >git branch -r
will show:
gnucap-main/master
....

4) >git merge --no-commit gnucap-main/master 
will merge changes
"gnucap-main/master" is <remote>

5) >git add fixes
   and
   >git commit -m "message"