Re: [PHP-DOC] PHPDoE with Git

2012-01-07 Thread Alexey Shein
2012/1/7 Alexander Moskaliov ir...@irker.net:
 Hello Yannick and all!
 I created branch for PHPDOE with Git support.
 http://svn.php.net/viewvc/web/doc-editor/branches/GIT_READY/
 I little tested it, so may contain errors.

 I used it for $Revision$ keyword:
 https://github.com/TheFrozenFire/git-rcs-keywords

Nice, thanks.

 new:
 - Git support
 - local.*.ini for local project settings
 - Simple autoload for classes

 tricks:
 - After commit new files, rm  git checkout it for update $Revision$ keyword
IIRC, you can do just git checkout, rm is not needed. It's also can be
done for whole repo, like this: git checkout repo rootdir here
 - Use git fetch  merge instead of pull, so there were no problems with
 rcs-keywords filters

Maybe it would be safer use git fetch  git reset --hard
origin/branchname insteadof merge, since merge can be aborted if
working copy is dirty (uncommited changes) or has some conflicting
commits. This approach works though if you wish to reject local
changes and always accept remote ones, anyways, it should be
thoroughly tested before going into production.

 I have free time until January 23, but I freeze my work on PHPDoE until as
 there is no details about the structure of the PHP Documentation in Git.


 With regards, Alexander Moskaliov
 ir...@irker.net



-- 
Regards,
Shein Alexey


Re: [PHP-DOC] PHPDoE with Git

2012-01-07 Thread Alexander Moskaliov
2012/1/7 Alexey Shein con...@gmail.com

 IIRC, you can do just git checkout, rm is not needed. It's also can be
 done for whole repo, like this: git checkout repo rootdir here

It does not work with filters, and that's why using rm before checkout.


 Maybe it would be safer use git fetch  git reset --hard
 origin/branchname insteadof merge, since merge can be aborted if
 working copy is dirty (uncommited changes) or has some conflicting
 commits. This approach works though if you wish to reject local
 changes and always accept remote ones, anyways, it should be
 thoroughly tested before going into production.

Now, all changes are stored in a separate folder outside of the repository.
All changes are added before committing and after the update repository.
But I think possible use Git reset, we must test it.

With regards, Alexander Moskaliov
ir...@irker.net


[PHP-DOC] Hi PHP Doc Group

2012-01-07 Thread Rick Bird
I'm Rick, or I go by Nveid in most other contexts.   Im mostly a free lance
developer, as well as I do development work for ISPConfig and manage a small
server host group.  Anywho, just introducing myself I'm going to start off
by submitting a SoapServer::setPersistence doc patch here in a few days.
I'm going to be  correcting what is wrong in it, and also clarifying what
may be misleading with this method.