Re: [Firebird-devel] Git and ChangeLog

2016-03-22 Thread Dmitry Yemanov
22.03.2016 19:47, Dimitry Sibiryakov wrote: > > Will ChangeLog be updated someday or it is abandoned? It will not be maintained anymore in its old form. Its new contents will migrate from WhatsNew which will be deleted. Dmitry --

[Firebird-devel] Git and ChangeLog

2016-03-22 Thread Dimitry Sibiryakov
Hello, All. Will ChangeLog be updated someday or it is abandoned? -- WBR, SD. -- Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Cl

Re: [Firebird-devel] Git

2016-03-21 Thread Dimitry Sibiryakov
20.03.2016 20:36, Michal Kubecek wrote: > However, you can always do the second piece of work on top of the first > and replace the original request by a new one containing both features. Hmmm... Rebasing of nested branches seems to be non-trivial and error-prone task... -- WBR, SD.

Re: [Firebird-devel] Git

2016-03-21 Thread Dimitry Sibiryakov
20.03.2016 20:36, Michal Kubecek wrote: > If you have project where pull request are often ignored for months, such > project has a problem and no VCS can possibly help. A good point. -- WBR, SD. -- Transform Data

Re: [Firebird-devel] Git

2016-03-20 Thread Michal Kubecek
On Sat, Mar 19, 2016 at 10:34:12PM -0400, James Starkey wrote: > > > On Saturday, March 19, 2016, Wols Lists wrote: > > On 16/03/16 21:03, Michal Kubecek wrote: > > An experienced developer might have 10 or 20 topics on the go - > each in their own separate branches. That way work

Re: [Firebird-devel] Git

2016-03-20 Thread Michal Kubecek
On Sun, Mar 20, 2016 at 10:21:05AM +0100, Dimitry Sibiryakov wrote: > 19.03.2016 23:38, Wols Lists wrote: > > But for the OP, read these books, and learn to use branches. This is > > the classic Git workflow - every little task should have its own git > > branch on your developer machine. Switching

Re: [Firebird-devel] Git

2016-03-20 Thread Lester Caine
On 20/03/16 02:34, James Starkey wrote: > An experienced developer might have 10 or 20 topics on the go - each in > their own separate branches. That way work doesn't cross-contaminate - > you don't want to accidentally upload a half-baked development because > you had to upload an

Re: [Firebird-devel] Git

2016-03-20 Thread Mark Rotteveel
On 2016-03-17 12:45, Dimitry Sibiryakov wrote: > 17.03.2016 12:33, Mark Rotteveel wrote: >> You don't*need* to have your own fork to do that, you can also >> create >> pull requests from branches in the same repository. So if Paul >> pushes >> his branch to origin, he can create a pull request f

Re: [Firebird-devel] Git

2016-03-20 Thread Dimitry Sibiryakov
19.03.2016 23:38, Wols Lists wrote: > But for the OP, read these books, and learn to use branches. This is the > classic Git workflow - every little task should have its own git branch > on your developer machine. Switching between branches is almost > cost-free, and then when you're ready to submi

Re: [Firebird-devel] Git

2016-03-20 Thread Dmitry Yemanov
16.03.2016 18:05, Paul Beach wrote: > > e.g. > git checkout -b mac-port B3_0_Release You need "git clone" before that (just once for all the subsequent work). Dmitry -- Transform Data into Opportunity. Accelerate data

Re: [Firebird-devel] Git

2016-03-19 Thread Dmitry Yemanov
17.03.2016 15:02, Adriano dos Santos Fernandes wrote: > Was our svn repository allowed for arbitrary branch creation without > project discussion till now? No! > > Now with github that would not even be necessary as one could fork and > do his things. > > So, to allow arbitrary branch creation in

Re: [Firebird-devel] Git

2016-03-19 Thread Michal Kubecek
On Wed, Mar 16, 2016 at 10:11:17PM +0100, Dimitry Sibiryakov wrote: > 16.03.2016 22:03, Michal Kubecek wrote: > > One of the advantages of getting used to use these "topic" branches > > rather than adding commits directly to a local copy of "upstream" branch > > (e.g. B3_0_Release here) is that it

Re: [Firebird-devel] Git

2016-03-19 Thread Dimitry Sibiryakov
17.03.2016 12:47, Adriano dos Santos Fernandes wrote: > But custom branches for minor or individual work should not go to > FirebirdSQL/firebird but to personal forks. Can github automatically merge changes from origin to personal forks? -- WBR, SD. ---

Re: [Firebird-devel] Git

2016-03-19 Thread James Starkey
On Saturday, March 19, 2016, Wols Lists wrote: > On 16/03/16 21:03, Michal Kubecek wrote: > > An experienced developer might have 10 or 20 topics on the go - each in > their own separate branches. That way work doesn't cross-contaminate - > you don't want to accidentally upload a half-baked devel

Re: [Firebird-devel] Git

2016-03-19 Thread Dimitry Sibiryakov
17.03.2016 12:58, Mark Rotteveel wrote: > Nope, you need to follow: > https://help.github.com/articles/syncing-a-fork/ Quite a few of handwork. -- WBR, SD. -- Transform Data into Opportunity. Accelerate data analy

Re: [Firebird-devel] Git

2016-03-19 Thread Dimitry Sibiryakov
17.03.2016 13:02, Adriano dos Santos Fernandes wrote: > Was our svn repository allowed for arbitrary branch creation without > project discussion till now? No! > > Now with github that would not even be necessary as one could fork and > do his things. > > So, to allow arbitrary branch creation in t

Re: [Firebird-devel] Git

2016-03-19 Thread Wols Lists
On 16/03/16 21:03, Michal Kubecek wrote: > One of the good ones is "Pro Git" book by Scott Chacon which can be > viewed or downloaded at > > https://git-scm.com/book/en/v2 > > For basic developer needs, chapters 1-3 are sufficient, to participate > in a project, chapter 5 can help (at least fir

Re: [Firebird-devel] Git

2016-03-19 Thread Dimitry Sibiryakov
17.03.2016 12:33, Mark Rotteveel wrote: > You don't*need* to have your own fork to do that, you can also create > pull requests from branches in the same repository. So if Paul pushes > his branch to origin, he can create a pull request from that branch to > the B_3_0_Release branch (assuming he h

Re: [Firebird-devel] Git

2016-03-19 Thread Adriano dos Santos Fernandes
On 17/03/2016 09:15, Dmitry Yemanov wrote: > 17.03.2016 15:02, Adriano dos Santos Fernandes wrote: > >> Was our svn repository allowed for arbitrary branch creation without >> project discussion till now? No! >> >> Now with github that would not even be necessary as one could fork and >> do his thi

Re: [Firebird-devel] Git

2016-03-19 Thread Adriano dos Santos Fernandes
On 17/03/2016 08:33, Mark Rotteveel wrote: > On 2016-03-17 11:56, Dimitry Sibiryakov wrote: >> 17.03.2016 11:24, Paul Beach wrote: >>> I am now trying to work out exactly what I need >>> to do to start committing some of my changes for the Mac Port for >>> 3.0 >>> back into git... >>I may be w

Re: [Firebird-devel] Git

2016-03-19 Thread Norman Dunbar
On 17/03/16 11:51, Dimitry Sibiryakov wrote: > Can github automatically merge changes from origin to personal forks? As far as I'm aware, no. When I have forked a project I need to pull my forket repository back to my laptop and work on it there. When changes are made to the master repo, I

Re: [Firebird-devel] Git

2016-03-19 Thread Adriano dos Santos Fernandes
On 17/03/2016 08:57, Mark Rotteveel wrote: >> But custom branches for minor or individual work should not go to >> FirebirdSQL/firebird but to personal forks. > Have we actually established that policy, or are you inventing that > rule on the spot? > > BTW: Not saying that I disagree, but I think

Re: [Firebird-devel] Git

2016-03-19 Thread Adriano dos Santos Fernandes
On 17/03/2016 09:08, Dimitry Sibiryakov wrote: > 17.03.2016 13:02, Adriano dos Santos Fernandes wrote: >> Was our svn repository allowed for arbitrary branch creation without >> project discussion till now? No! >> >> Now with github that would not even be necessary as one could fork and >> do his t

[Firebird-devel] Git Submodule

2016-03-19 Thread Jim Starkey
My experimentation with git submodules was completely successful. Basically trivial. To enable, in the project root directory, do a git submodule add In the project CMakeLists.txt add something like add_subdirectory ( EXCLUDE_FROM_ALL) This will prevent unreferenced subpr

Re: [Firebird-devel] Git

2016-03-19 Thread Treeve Jelbert
On Wed, 16 Mar 2016 16:05:36 +0100, Paul Beach wrote: > Since some of us are newbies to git and github, I need to ask some > questions > as I would like to move onto git asap and stop using sourceforge and > svn. > > I had started looking at the Firebird 3 build and port for MacOS, and > am curio

Re: [Firebird-devel] Git

2016-03-19 Thread Jiří Činčura
> git push :branchname Which is changed for couple of year already. `git push --delete ` -- Mgr. Jiří Činčura Independent IT Specialist -- Transform Data into Opportunity. Accelerate data analysis in your applications

Re: [Firebird-devel] Git

2016-03-19 Thread Mark Rotteveel
On 2016-03-17 13:22, Adriano dos Santos Fernandes wrote: > Yes, but branching locally, not pushing personal branches to official > repository. > > Git remote branch delete is not even intuitive. I always need to > search > and do things scary to delete remote branches. Yeah, whoever thought that

Re: [Firebird-devel] Git

2016-03-19 Thread Jim Starkey
On 3/17/2016 6:56 AM, Dimitry Sibiryakov wrote: > 17.03.2016 11:24, Paul Beach wrote: >> I am now trying to work out exactly what I need >> to do to start committing some of my changes for the Mac Port for 3.0 >> back into git... > I may be wrong, but you cannot create a pull request from local

Re: [Firebird-devel] Git

2016-03-19 Thread Mark Rotteveel
On 2016-03-17 12:51, Dimitry Sibiryakov wrote: > 17.03.2016 12:47, Adriano dos Santos Fernandes wrote: >> But custom branches for minor or individual work should not go to >> FirebirdSQL/firebird but to personal forks. > >Can github automatically merge changes from origin to personal > forks?

Re: [Firebird-devel] Git

2016-03-19 Thread Dmitry Yemanov
17.03.2016 13:56, Dimitry Sibiryakov wrote: > I may be wrong, but you cannot create a pull request from local repository > clone. You > must fork it into your account beforehand. Paul doesn't need to use pull requests, he may commit directly. Dmitry --

Re: [Firebird-devel] Git

2016-03-19 Thread Michal Kubecek
On Thu, Mar 17, 2016 at 01:55:08PM +0100, Jiří Činčura wrote: > > git push :branchname > > Which is changed for couple of year already. > `git push --delete ` More precisely, the latter was added as a nicer alias for the former. As git-push(1) says: --delete All listed refs are deleted fr

Re: [Firebird-devel] Git

2016-03-19 Thread Dimitry Sibiryakov
17.03.2016 11:24, Paul Beach wrote: > I am now trying to work out exactly what I need > to do to start committing some of my changes for the Mac Port for 3.0 > back into git... I may be wrong, but you cannot create a pull request from local repository clone. You must fork it into your account

Re: [Firebird-devel] Git

2016-03-19 Thread Mark Rotteveel
On 16-3-2016 16:05, Paul Beach wrote: > > Since some of us are newbies to git and github, I need to ask some questions > as I would like to move onto git asap and stop using sourceforge and svn. > > I had started looking at the Firebird 3 build and port for MacOS, and am > curious > as how I can d

Re: [Firebird-devel] Git

2016-03-19 Thread Dimitry Sibiryakov
16.03.2016 22:03, Michal Kubecek wrote: > One of the advantages of getting used to use these "topic" branches > rather than adding commits directly to a local copy of "upstream" branch > (e.g. B3_0_Release here) is that it allows you to work on several > different bugs or features and simply switch

Re: [Firebird-devel] Git

2016-03-19 Thread Egor Pugin
Make forks not branches. четверг, 17 марта 2016 г. пользователь Dimitry Sibiryakov написал: > 17.03.2016 13:02, Adriano dos Santos Fernandes wrote: > > Was our svn repository allowed for arbitrary branch creation without > > project discussion till now? No! > > > > Now with github that would not

Re: [Firebird-devel] Git

2016-03-19 Thread Michal Kubecek
On Thu, Mar 17, 2016 at 11:56:37AM +0100, Dimitry Sibiryakov wrote: > 17.03.2016 11:24, Paul Beach wrote: > > I am now trying to work out exactly what I need > > to do to start committing some of my changes for the Mac Port for 3.0 > > back into git... > > I may be wrong, but you cannot create a p

Re: [Firebird-devel] Git

2016-03-19 Thread Michal Kubecek
On Wed, Mar 16, 2016 at 08:48:31PM +0100, Mark Rotteveel wrote: > > Branches can make life easier. You can keep your work in progress out of > the way from the changes to master, and when you are done you can merge > them back into master (which occasionally requires something akin to > magic s

[Firebird-devel] Git

2016-03-19 Thread Paul Beach
Since some of us are newbies to git and github, I need to ask some questions as I would like to move onto git asap and stop using sourceforge and svn. I had started looking at the Firebird 3 build and port for MacOS, and am curious as how I can do this work via git. Since git can uses branches fo

Re: [Firebird-devel] Git

2016-03-18 Thread Mark Rotteveel
On 2016-03-17 11:56, Dimitry Sibiryakov wrote: > 17.03.2016 11:24, Paul Beach wrote: >> I am now trying to work out exactly what I need >> to do to start committing some of my changes for the Mac Port for >> 3.0 >> back into git... > >I may be wrong, but you cannot create a pull request from l

Re: [Firebird-devel] Git

2016-03-18 Thread Paul Beach
> > e.g. > > git checkout -b mac-port B3_0_Release > > You need "git clone" before that (just once for all the subsequent work). I have got as far as that - I am now trying to work out exactly what I need to do to start committing some of my changes for the Mac Port for 3.0 back into git... now

Re: [Firebird-devel] Git

2016-03-18 Thread Mark Rotteveel
On 2016-03-17 12:47, Adriano dos Santos Fernandes wrote: > On 17/03/2016 08:33, Mark Rotteveel wrote: >> On 2016-03-17 11:56, Dimitry Sibiryakov wrote: >>> 17.03.2016 11:24, Paul Beach wrote: I am now trying to work out exactly what I need to do to start committing some of my changes for

Re: [Firebird-devel] git repo not updated since 25/10

2015-11-06 Thread Adriano dos Santos Fernandes
On 06/11/2015 06:57, Treeve Jelbert wrote: > the most recent update is 62417 > > > Author: hvlad > Date: Sun Oct 25 13:54:39 2015 + > > Fixed bug CORE-4968 : fbtrace.conf in FB30-HOME: missing equality > sign ('=') between parameter "log_errors" and its default values > ("false") >

[Firebird-devel] git repo not updated since 25/10

2015-11-06 Thread Treeve Jelbert
the most recent update is 62417 Author: hvlad Date: Sun Oct 25 13:54:39 2015 + Fixed bug CORE-4968 : fbtrace.conf in FB30-HOME: missing equality sign ('=') between parameter "log_errors" and its default values ("false") https://github.com/FirebirdSQL/core.git --

Re: [Firebird-devel] git repo not updated

2013-01-09 Thread Alex Peshkoff
On 01/10/13 10:31, Dmitry Yemanov wrote: > 10.01.2013 10:25, Alex Peshkoff wrote: > >> May be we should lock old SVN repository like it was done with CVS? > IMO, it should be disabled even for reading. The engine does not compile > there anyway, thus causing confusions. > I've disabled posix build

Re: [Firebird-devel] git repo not updated

2013-01-09 Thread Dmitry Yemanov
10.01.2013 10:25, Alex Peshkoff wrote: > May be we should lock old SVN repository like it was done with CVS? IMO, it should be disabled even for reading. The engine does not compile there anyway, thus causing confusions. Dmitry

Re: [Firebird-devel] git repo not updated

2013-01-09 Thread Alex Peshkoff
On 01/10/13 04:56, Adriano dos Santos Fernandes wrote: > * Due to the fact that sourceforge accepted some commits on the older > SVN repository... May be we should lock old SVN repository like it was done with CVS? -- Ma

Re: [Firebird-devel] git repo not updated

2013-01-09 Thread Adriano dos Santos Fernandes
On 09-01-2013 06:47, Treeve Jelbert wrote: > the git repository at > > git://github.com/asfernandes/firebird.git > > does not seem to have been updated since Dec 18, > I have manually pushed (*) the changes and I believe it will push automatically since now. * Due to the fact that sourceforge

Re: [Firebird-devel] git repo not updated

2013-01-09 Thread Adriano dos Santos Fernandes
On 09/01/2013 07:42, Michal Kubecek wrote: > On Wed, Jan 09, 2013 at 09:47:25AM +0100, Treeve Jelbert wrote: >> the git repository at >> >> git://github.com/asfernandes/firebird.git >> >> does not seem to have been updated since Dec 18, > I guess the source SVN repository URL needs to be updated af

Re: [Firebird-devel] git repo not updated

2013-01-09 Thread Michal Kubecek
On Wed, Jan 09, 2013 at 09:47:25AM +0100, Treeve Jelbert wrote: > the git repository at > > git://github.com/asfernandes/firebird.git > > does not seem to have been updated since Dec 18, I guess the source SVN repository URL needs to be updated after the migration.

[Firebird-devel] git repo not updated

2013-01-09 Thread Treeve Jelbert
the git repository at git://github.com/asfernandes/firebird.git does not seem to have been updated since Dec 18, -- Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery and much more. Keep your Java