Re: [Firebird-devel] Git and ChangeLog

[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


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

[Firebird-devel] Git and ChangeLog

[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.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785351=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 doesn't
> cross-contaminate - you don't want to accidentally upload a
> half-baked development because you had to upload an unrelated
> emergency bug-fix ... :-)
> 
> A developer who does that, experienced or novice, is going to lose
> his or her mind.  Been thre, done that, went nuts.  One can only
> juggle so much complexity.

First, I did _not_ write the quote above. But I agree with it anyway.

Second, what would be a level of complexity threatening to make one lose
his mind would be the exact opposite: trying to handle multiple pieces
of work in progress without keeping them in separate branches. You also
shouldn't forget that having 10-20 live branches doesn't mean they all
have to be actively worked on at the moment. Some may be fixes waiting
to be confirmed by reporter, some may be waiting for review and some are
long term work in progress, currently on back burner. Or you can try two
or three different fixes for the same issue and keep them all available
until the best is selected.

  Michal Kubecek

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 between branches is
> > almost cost-free, and then when you're ready to submit your work you
> > rebase to the latest master, squash your branch into a single commit
> > (if it's not too big), and upload it for review and committing.
> 
> It is fine for independent pieces of work when pull requests are
> accepted quickly. But suppose that you finished one piece, pushed it,
> created a pull request and start a new work that require previous
> changes to work. When you finished this work too, push it and create a
> new pull request before first one was even looked at, you'll end up
> with mess.

As I said before, this is completely independent of VCS choice. If you
have project where pull request are often ignored for months, such
project has a problem and no VCS can possibly help.

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.

 Michal Kubecek


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 unrelated emergency bug-fix ... :-)
> 
> A developer who does that, experienced or novice, is going to lose
> his or her mind.  Been there, done that, went nuts.  One can only juggle
> so much complexity.

I'll second that ... especially when one is sharing work with other
developers that has not yet even been flagged with a push to the main
repo. In my case several third party components each with their own
github master.

To retain sanity here I keep the repository views of the code ring
fenced in their own clean folders and then use 'BeyondCompare' to cherry
pick any new work that potentially conflicts with my own developments.
The automatic merges done by git may hide things you want to pick up on?
This is where 'submodule' access to a third party library can conflict
with the version that you are currently working with.

Working on a single target program *IS* a lot easier than some of the
projects that I'm working with, but having a clean base to build on is
essential? And as I understand it, having one 'release manager'
controlling the 'master' code branch is sensible?

-- 
Lester Caine - G8HFL
-
Contact - http://lsces.co.uk/wiki/?page=contact
L.S.Caine Electronic Services - http://lsces.co.uk
EnquirySolve - http://enquirysolve.com/
Model Engineers Digital Workshop - http://medw.co.uk
Rainbow Digital Media - http://rainbowdigitalmedia.co.uk

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 from that branch 
>> to
>> the B_3_0_Release branch (assuming he has at least sufficient rights 
>> to
>> push his own branch).
>
>Is it possible to have rights to fork a branch and push into it,
> without rights to push
> into the master branch?

See the protected branches feature linked to earlier.

Mark

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 submit your work you rebase to
> the latest master, squash your branch into a single commit (if it's not
> too big), and upload it for review and committing.

   It is fine for independent pieces of work when pull requests are accepted 
quickly. But 
suppose that you finished one piece, pushed it, created a pull request and 
start a new 
work that require previous changes to work. When you finished this work too, 
push it and 
create a new pull request before first one was even looked at, you'll end up 
with mess.

-- 
   WBR, SD.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 the official repository, an
> admin discussion would be needed.

In SVN, we had "sticky" branches for releases, that's all. But the Git 
workflow suggests to use branches for the every non-trivial piece of 
work. I see no problems with active branching provided that working 
branches are removed immediately after merging upstream. I'd suggest 
this as a recommended way for core team members (who have direct repo 
access). Branching in personal forks and creating pull requests should 
be the way for external contributors. They're not allowed to create 
branches in the official repo.


Dmitry


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 allows you to work on several
> > different bugs or features and simply switch between the branches as
> > needed. The workflow could look like
> 
> It is fine, but what will happen to gigabytes of object files in
> temp dir after switching from one branch to another? Full rebuild
> every time?

Not necessarily. Switching between two topic branches forked from e.g.
B3_0_Release should leave most of the source tree intact. However, to be
able to build within the local git repository and still use it for devel
work, we will need to create a .gitignore file covering all files and
directories generated by the build (which is a certainly a good idea).

For branches forked from very different upstream branches, you can
either use multiple clones or (with recent git versions, IIRC since 2.5
or 2.6) multiple worktrees sharing the same objects (git worktree ...).

It's a matter of scale, I would say. Working with linux kernel most of
the time, I kind of fail to see Firebird repository as big or taking too
long to build from scratch. :-)

> > With Github workflow, one usually pushes into his fork of the original
> > repository and then creates a pull request using the web interface.
> 
>How many years can live a pull request without resolution on GitHub?

That depends on the project and its maintainers, of course. But this is
a problem completely orthogonal to the choice of VCS or VCS hosting
service.

 Michal Kubecek

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 development because
> you had to upload an unrelated emergency bug-fix ... :-)
>
>
> A developer who does that, experienced or novice, is going to lose his or
her mind.  Been thre, done that, went nuts.  One can only juggle so much
complexity.


-- 
Jim Starkey
--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 the official repository, an
> admin discussion would be needed.

   Lightweight branches are supposed to be a Git's main feature. Does it has 
any meaning 
without them?

-- 
   WBR, SD.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 first two sections) and as we
> are moving to Github, chapter 6 can be handy (again, at least first two
> sections).

I've just finished reading it, and would second that recommendation.

There's also "Git - Ry's Git Tutorial", which I found as a Kindle
freebie, and is probably better than Pro Git for the absolute beginner,
although I would recommend both.

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 submit your work you rebase to
the latest master, squash your branch into a single commit (if it's not
too big), and upload it for review and committing.

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 unrelated emergency bug-fix ... :-)

Cheers,
Wol

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 has at least sufficient rights to
> push his own branch).

   Is it possible to have rights to fork a branch and push into it, without 
rights to push 
into the master branch?

-- 
   WBR, SD.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 things.
>>
>> So, to allow arbitrary branch creation in the official repository, an
>> admin discussion would be needed.
> In SVN, we had "sticky" branches for releases, that's all. But the Git 
> workflow suggests to use branches for the every non-trivial piece of 
> work. I see no problems with active branching provided that working 
> branches are removed immediately after merging upstream.

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.

I'd say, If I have a branch which requires major development and want to
backup it, I push to my personal fork.

If it's a "project thing" (a well discussed, something requiring
collaboration, or project do not want to see that work disappear if I go
crazy and delete my fork), then it should go to official repository.


Adriano


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 wrong, but you cannot create a pull request from local
>> repository clone. You
>> must fork it into your account beforehand.
> 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 has at least sufficient rights to 
> push his own branch).
>
>
But custom branches for minor or individual work should not go to
FirebirdSQL/firebird but to personal forks.


Adriano


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 need to do the following:

(once only):

git remote add upstream https://github.com/whatever.git

I can check this is present by running:

git remote -v


Then when I need to update my fork on github, I do this:

cd my/source/location
git fetch upstream## effectively checks out upstream/master
git checkout master   ## checks out my master branch
git merge upstream/master ## merges upstream changes into mine
git push  ## Push back to my github fork.

At this point my forked repository is equal to, or slightly advanced, if 
I've done any changes, compared to the master repository.

I usually do the above before making any changes, just to try and avoid 
any conflicts later on.


HTH

Cheers,
Norm.

-- 
Norman Dunbar
Dunbar IT Consultants Ltd

Registered address:
27a Lidget Hill
Pudsey
West Yorkshire
United Kingdom
LS28 7LG

Company Number: 05132767

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 we are inventing rules on 
> the fly that not everyone agreed on.
>
>
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 the official repository, an
admin discussion would be needed.


Adriano


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 things.
>>
>> So, to allow arbitrary branch creation in the official repository, an
>> admin discussion would be needed.
>Lightweight branches are supposed to be a Git's main feature. Does it has 
> any meaning 
> without them?
>
Yes!

Git!

Git is not GitHub!

GitHub is not your local work!

GitHub official repo is not your fork!

It's completely nonsense or nitpicking what's being discussed, it's
nonsense to pollute official repository with branches for what I'm
saying (minor work or major work not discussed with project admins).
I'll go now.


Adriano


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

[Firebird-devel] Git Submodule

[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  subprojects of the submodule from 
showing up in the build and/or Visual Studio.  The only gotcha that I've 
run into is that you can edit files in the submodule, but they can never 
be committed or pushed.  Probably smart to set them all readonly.

When cloning a respository with a submodule, it's necessary to add the 
--recursive switch.

CMake also has an external project capability that has nothing to do 
with git submodules.  Don't try and mix them.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 curious
> as how I can do this work via git. Since git can uses branches for
> every piece of
> development (small to large), I am assuming I need to create my own
> development
> branch of B3_0_Release to work on...
>
> e.g.
> git checkout -b mac-port B3_0_Release
>
> Then I do what I need to inside this checkout,  via
> git add, git commit, when finished I can then merge
> my branch back into B3_0_Release
>
> Correct - or have I completely misread everything :-)
> In which case some pointers would be appreciated
>

correct, if B3_0_Release is a branch

> Regards
> Paul
>
> 
> --
> Transform Data into Opportunity.
> Accelerate data analysis in your applications with
> Intel Data Analytics Acceleration Library.
> Click to learn more.
> http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
> Firebird-Devel mailing list, web interface at
> https://lists.sourceforge.net/lists/listinfo/firebird-devel


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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

git push :branchname

would be intuitive that it deletes...

> I'd say, If I have a branch which requires major development and want 
> to
> backup it, I push to my personal fork.
>
> If it's a "project thing" (a well discussed, something requiring
> collaboration, or project do not want to see that work disappear if I 
> go
> crazy and delete my fork), then it should go to official repository.

I agree on that.

Mark

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 
> repository clone. You
> must fork it into your account beforehand.
>

If the question is whether you can clone from a clone, the answer is yes.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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?

Nope, you need to follow: 
https://help.github.com/articles/syncing-a-fork/

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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


--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 from the remote repository. This is the
same as prefixing all refs with a colon.

Michal Kubecek

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 beforehand.

-- 
   WBR, SD.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 do this work via git. Since git can uses branches for every 
> piece of
> development (small to large), I am assuming I need to create my own 
> development
> branch of B3_0_Release to work on...
>
> e.g.
> git checkout -b mac-port B3_0_Release
>
> Then I do what I need to inside this checkout,  via
> git add, git commit, when finished I can then merge
> my branch back into B3_0_Release
>
> Correct - or have I completely misread everything :-)
> In which case some pointers would be appreciated

When you use git, you have local copy of the repository on your own 
machine. Commits go into this local repository, and until you push them 
to the origin repository, no one but you is affected. So in some ways, a 
master branch on your machine already is a branch of the master branch 
on the origin repository.

So you don't *need* to create branches just to do things, but it can 
make life easier, especially in heavy traffic repositories, or when you 
need to share work in progress with others (pushing the branch to origin).

But you can also continue using largely the same workflow as you used 
with Subversion, but you need to remember not only to commit, but also 
to push, pull and be prepared to handle the merge conflicts associated 
with having your own copy of the repository that might be in a different 
state than the origin repository.

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 spells with merges from master to branch, conflict resolution, 
rebases, merges from branch to master, holy wars about the preferences 
of merge method (do you rebase and fast-forward, or not), etc).

Or you can keep your changes in the branch, push the branch to the 
origin repository and then use a pull request as a review mechanism.

However branches can also make life harder, for example long-living 
branches that diverge from master without regular merges from master 
that need to be merged back can be hell (especially if you have a 
co-worker who does a merge with "accept mine" as a conflict resolution 
strategy, I think I got a few gray hairs that day...).

There are lots of tutorials and other documentation that can help, and 
that probably explain things a lot better than my confused rambling 
above ;).

Mark
-- 
Mark Rotteveel

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 between the branches as
> needed. The workflow could look like

   It is fine, but what will happen to gigabytes of object files in temp dir 
after 
switching from one branch to another? Full rebuild every time?

> With Github workflow, one usually pushes into his fork of the original
> repository and then creates a pull request using the web interface.

   How many years can live a pull request without resolution on GitHub?

-- 
   WBR, SD.

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 local
> repository clone. You
> must fork it into your account beforehand.

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 has at least sufficient rights to 
push his own branch).

Mark

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 that I have 3.0 building cleanly.

Regards
Paul

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] Git

[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 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 beforehand.
>> 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 has at least sufficient rights 
>> to
>> push his own branch).

> 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 we are inventing rules on 
the fly that not everyone agreed on.

Mark

--
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785231=/4140
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

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

[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")
>
>
>
> https://github.com/FirebirdSQL/core.git
>
>
Just forgot to rebuild my cron job after OS change. :D

Will do it tonight, thanks.


Adriano


--
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

[Firebird-devel] git repo not updated

[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 skills current with LearnJavaNow -
200+ hours of step-by-step video tutorials by Java experts.
SALE $49.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122612 
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] git repo not updated

[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 accepted some commits on the older
SVN repository, and that commits were already pushed to GIT, I had to
force push now, so the latests commits have changed. Not a good thing,
but no better way to do it. I hope it still works. :)


Adriano

--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] git repo not updated

[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?


--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] git repo not updated

[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


--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel

Re: [Firebird-devel] git repo not updated

[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 in trunk, 2.1  2.5.
Ideally our SF admins should contact SF support.


--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
Firebird-Devel mailing list, web interface at 
https://lists.sourceforge.net/lists/listinfo/firebird-devel