[Gambas-devel] Gambas to Git(Lab)
PICCORO McKAY Lenz
mckaygerhard at ...176...
Sun Jul 23 16:17:54 CEST 2017
git have REAL branchs and tas.. SVN do just copy's, also SVN its
centraliced a problem in team collaborations , due the fusion of resulting
jobs comes in many deadlocks at the developer side.. of course at the
server central side are very easy to mantain.. but we must see the horizont
i'm not avocate of "up to date things" but in this way are really need..
also the SF interface are so slower when i goin to the cybercafe.. due i'm
not have internet access at my home..
so in many ways the SVN (and for me that the most important part) can work
offline.. SVN need connection alive to mark commits... its very tedious for
me use SVN due i not have internet connection.. so that the mayor
problem.. the very centralised behavior that git does are more flexible!
> Date: Sun, 23 Jul 2017 01:33:09 +0200
> From: Beno?t Minisini <gambas at ...1...>
> The problem I encountered when moving from subversion to git in my job
> is that git does not really have tags and branches that behave the same
> way. I.e. being actual independent trees.
>
> A recently added feature named "working tree" in git seems to help to do
> the same thing: developing on different versions at the same time.
>
> Or maybe I didn't understand how to use git for that?
>
> Regards,
>
> --
> Beno?t Minisini
>
> --
> Beno?t Minisini
>
>
>
> ------------------------------
>
> Message: 3
> Date: Sun, 23 Jul 2017 04:01:04 +0200
> From: "Adrien Prokopowicz" <adrien.prokopowicz at ...176...>
> To: "mailing list for gambas developers"
> <gambas-devel at lists.sourceforge.net>
> Subject: Re: [Gambas-devel] Gambas to Git(Lab)
> Message-ID: <op.y3s3v2cwdlsaci at ...102...>
> Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes
>
> Le Sun, 23 Jul 2017 01:33:09 +0200, Beno?t Minisini via Gambas-devel
> <gambas-devel at lists.sourceforge.net> a ?crit:
> >
> > The problem I encountered when moving from subversion to git in my job
> > is that git does not really have tags and branches that behave the same
> > way. I.e. being actual independent trees.
> >
> > A recently added feature named "working tree" in git seems to help to do
> > the same thing: developing on different versions at the same time.
> >
> > Or maybe I didn't understand how to use git for that?
> >
> > Regards,
> >
>
> You can work on different versions/branches at the same time. It's just
> that branches
> in Git are waay different from SVN branches. :)
>
> In SVN, both branches and tags do not really exist : they are just separate
> directories, and creating a new branch/tag essentially means copying the
> entire
> directory over, from /trunk to /branches/3.10 for example.
> (SVN actually uses some Copy-on-Write mechanisms under the hood, such as
> hard-links,
> but from the user point of view it is just a regular copy).
>
> In Git however, branches are more of a diverged history : they share the
> same history
> up to the point where you create the branch, but then the commits you make
> in each
> branch are completely separate.
> For example, you create a new 3.10 branch from the master (main) branch.
> The commits
> you add to the 3.10 branch will not be applied to the master branch, and
> if you switch
> back to master, you are in the same state you were before creating the
> branch, and from
> there you can add some commits to master (which will not affect 3.10).
>
> You can check out the Git documentation about branches here [0]. It has
> diagrams
> and all the commands needed to work with branches. But if you (in the
> broad sense, not
> just Beno?t) have questions, you can just ask me. :)
>
> What I really like about workflows based on Git branches, is that they
> make it really
> easy to start working on new (and unfinished) features without submitting
> them
> to the main branch. You simply create a new branch and start working in
> it, allowing
> everyone to see your work and provide feedback, without having to include
> it in the
> next release.
> And when your work is ready, you just merge it back into the main branch.
> :)
>
> A recent example of this would be the gb.term.form component : Fabien
> started working
> on it at the time of Gambas 3.9, but just said it is not ready for 3.10.
> If the unfinished
> component is in its own branch, then you can just release what is on the
> main branch
> without worrying. (This kind of workflow is also explained in the Git
> documentation,
> see here[1]).
>
> What makes this workflow even more awesome is the fact than anybody (on
> GitLab/GitHub)
> can fork the Gambas repository (i.e. copy the repository into a new one
> they own),
> make changes in their repository, and then ask to merge the changes
> through a
> Merge Request[2] (GitHub calls these Pull Requests). You can then review
> their
> changes, approve them (or not), and merge them.
> This is great for allowing one-time contributors to participate without
> having to
> give them full permissions on the repository (and it's much better than
> sending
> a patch for review). :)
>
> (? and here I made a hundred-page-long message again. Sorry about that,
> but Git
> is exciting !)
>
> Regards,
>
> [0]
> https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
> [1] https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows
> [2] https://docs.gitlab.com/ee/user/project/merge_requests/index.html
>
> --
> Adrien Prokopowicz
>
>
>
> ------------------------------
>
> Message: 4
> Date: Sun, 23 Jul 2017 12:02:30 +0200
> From: Christof Thalhofer <chrisml at ...757...>
> To: mailing list for gambas developers
> <gambas-devel at lists.sourceforge.net>
> Subject: Re: [Gambas-devel] Fwd: Re: Gambas to Git(Lab)
> Message-ID: <dc6a5e55-6098-c328-048c-ff9973491581 at ...757...>
> Content-Type: text/plain; charset="utf-8"
>
> Am 23.07.2017 um 01:33 schrieb Beno?t Minisini via Gambas-devel:
>
> > The problem I encountered when moving from subversion to git in my job
> > is that git does not really have tags and branches that behave the same
> > way. I.e. being actual independent trees.
> >
> > A recently added feature named "working tree" in git seems to help to do
> > the same thing: developing on different versions at the same time.
>
> I did not use that feature, as I only switch between different branches
> in my code (maybe one for each release). But it seems to have advantages
> if you have very big repositories (where switching between branches
> costs too much time):
>
> https://stackoverflow.com/questions/31935776/what-would-
> i-use-git-worktree-for
>
> > Or maybe I didn't understand how to use git for that?
>
> Here is a good explanation of common git workflows:
> https://www.atlassian.com/git/tutorials/comparing-workflows
>
> Why do you want to develop in different versions at the same time, to
> fix bugs? Look at "Maintenance Branches" and "Hotfix", maybe that is,
> what you wanted to do?
>
> I am unsure what sort of development workflow would be the best for Gambas.
>
> If I look at a big projekt for example that put its codebase to Git ?
> OTRS ? they did it so:
>
> https://github.com/OTRS/otrs
>
> Look there at the branches and tags. They seem to have ongoing
> development in master with branches for the "big" releases. Tags are
> used to point to subreleases.
>
>
> Alles Gute
>
> Christof Thalhofer
>
> --
> Dies ist keine Signatur
>
> -------------- next part --------------
> A non-text attachment was scrubbed...
> Name: signature.asc
> Type: application/pgp-signature
> Size: 819 bytes
> Desc: OpenPGP digital signature
>
> ------------------------------
>
> Message: 5
> Date: Sun, 23 Jul 2017 12:03:45 +0200
> From: Christof Thalhofer <chrisml at ...757...>
> To: mailing list for gambas developers
> <gambas-devel at lists.sourceforge.net>
> Subject: Re: [Gambas-devel] Gambas to Git(Lab)
> Message-ID: <5db13c3a-789a-8258-14d9-2049368628fd at ...757...>
> Content-Type: text/plain; charset="utf-8"
>
> Am 23.07.2017 um 04:01 schrieb Adrien Prokopowicz:
>
> > but Git
> > is exciting !)
>
> Yes! Full Ack!
> :-)
>
> I love to work with Git. It makes the horizont so much wider.
>
>
> Alles Gute
>
> Christof Thalhofer
>
> --
> Dies ist keine Signatur
>
> -------------- next part --------------
> A non-text attachment was scrubbed...
> Name: signature.asc
> Type: application/pgp-signature
> Size: 819 bytes
> Desc: OpenPGP digital signature
>
> ------------------------------
>
> ------------------------------------------------------------
> ------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>
> ------------------------------
>
> Subject: Digest Footer
>
> _______________________________________________
> Gambas-devel mailing list
> Gambas-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/gambas-devel
>
>
> ------------------------------
>
> End of Gambas-devel Digest, Vol 112, Issue 3
> ********************************************
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gambas-basic.org/pipermail/devel/attachments/20170723/71f1c1c8/attachment.html>
More information about the Devel
mailing list