Re: [PHP-DOC] PHPDoE with Git
Hi Alexander, Just view your work on Git support. Great work, really ! Once the Git migration done on the documentation, we will be able to back online the editor in a few time, and test it directly (& fix it too). Best, Yannick 2012/1/7 Alexander Moskaliov > > > > 2012/1/7 Alexey Shein >> >> IIRC, you can do just git checkout, rm is not needed. It's also can be >> done for whole repo, like this: git checkout >> > 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/ 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 >
Re: [PHP-DOC] PHPDoE with Git
2012/1/7 Alexey Shein > > IIRC, you can do just git checkout, rm is not needed. It's also can be > done for whole repo, like this: git checkout > 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/ 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
Re: [PHP-DOC] PHPDoE with Git
2012/1/7 Alexander Moskaliov : > 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 > - 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/ 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
