Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > comp.lang.python > #68484 > unrolled thread

Re: Question about Source Control

Back to article view | Back to comp.lang.python

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  Re: Question about Source Control Ben Finney <ben+python@benfinney.id.au> - 2014-03-18 17:47 +1100
    Re: Question about Source Control Steven D'Aprano <steve@pearwood.info> - 2014-03-18 07:55 +0000
      Re: Question about Source Control Chris Angelico <rosuav@gmail.com> - 2014-03-18 19:08 +1100
        Re: Question about Source Control Steven D'Aprano <steve+comp.lang.python@pearwood.info> - 2014-03-18 13:45 +0000
          Re: Question about Source Control Dave Angel <davea@davea.name> - 2014-03-18 16:51 -0400

#68484 — Re: Question about Source Control

"Frank Millman" <frank@chagford.com> writes:

> I feel that I have just not grasped the basics yet, so any assistance that 
> puts me on the right path is appreciated.

Here is “Hg Init”, a tutorial for Mercurial <URL:http://hginit.com/>.

(“source control” is not the most common term for this; what we're
talking about is a “version control system”, or VCS. But some Git users
may disagree.)

-- 
 \         “If nature has made any one thing less susceptible than all |
  `\    others of exclusive property, it is the action of the thinking |
_o__)                          power called an idea” —Thomas Jefferson |
Ben Finney

[toc] | [next] | [standalone]

#68493

On Tue, 18 Mar 2014 17:47:51 +1100, Ben Finney wrote:

> "Frank Millman" <frank@chagford.com> writes:
> 
>> I feel that I have just not grasped the basics yet, so any assistance
>> that puts me on the right path is appreciated.
> 
> Here is “Hg Init”, a tutorial for Mercurial <URL:http://hginit.com/>.
> 
> (“source control” is not the most common term for this; what we're
> talking about is a “version control system”, or VCS. But some Git users
> may disagree.)

I don't think that *version* control is the right model to describe what 
hg and git do, although it may be appropriate for subversion. hg doesn't 
manage *versions*, it manages changes to source code ("changesets"). 
Mercurial describes itself as a "distributed source control management 
tool", so I think the term "source control" is quite appropriate.

http://mercurial.selenic.com/


-- 
Steve

[toc] | [prev] | [next] | [standalone]

#68496

On Tue, Mar 18, 2014 at 6:55 PM, Steven D'Aprano <steve@pearwood.info> wrote:
> I don't think that *version* control is the right model to describe what
> hg and git do, although it may be appropriate for subversion. hg doesn't
> manage *versions*, it manages changes to source code ("changesets").

Meh... Is there any real difference? With git, I can check out any
tree state I like ("give me the 50th parent of the current HEAD"), so
in that sense it effectively stores versions - at least, it can
retrieve or recreate versions. Does it store versions and optimize
them by recording only the difference, or record differences and
replay them to recreate a state? Two sides of the same coin.

ChrisA

[toc] | [prev] | [next] | [standalone]

#68503

On Tue, 18 Mar 2014 19:08:17 +1100, Chris Angelico wrote:

> On Tue, Mar 18, 2014 at 6:55 PM, Steven D'Aprano <steve@pearwood.info>
> wrote:
>> I don't think that *version* control is the right model to describe
>> what hg and git do, although it may be appropriate for subversion. hg
>> doesn't manage *versions*, it manages changes to source code
>> ("changesets").
> 
> Meh... Is there any real difference? 

If you believe Joel Spolsky, there is:

http://hginit.com/00.html

Scroll down about half way, to the section titled "One more big 
conceptual difference".

Recording *snapshots* versus recording *diffs* makes a considerable 
difference when it comes to dealing with merge conflicts.



-- 
Steven

[toc] | [prev] | [next] | [standalone]

#68517

 Steven D'Aprano <steve+comp.lang.python@pearwood.info> Wrote in
 message:
> On Tue, 18 Mar 2014 19:08:17 +1100, Chris Angelico wrote:
> 
>> On Tue, Mar 18, 2014 at 6:55 PM, Steven D'Aprano <steve@pearwood.info>
>> wrote:
>>> I don't think that *version* control is the right model to describe
>>> what hg and git do, although it may be appropriate for subversion. hg
>>> doesn't manage *versions*, it manages changes to source code
>>> ("changesets").
>> 
>> Meh... Is there any real difference? 
> 
> If you believe Joel Spolsky, there is:
> 
> http://hginit.com/00.html
> 
> Scroll down about half way, to the section titled "One more big 
> conceptual difference".
> 
> Recording *snapshots* versus recording *diffs* makes a considerable 
> difference when it comes to dealing with merge conflicts.
> 

So which does git do, according to this model? 


-- 
DaveA

[toc] | [prev] | [standalone]

Back to top | Article view | comp.lang.python

csiph-web