Patchwork [website] Replace some subversion references by Git ones

login
register
mail settings
Submitter Stéphane Blondon
Date Oct. 13, 2020, 4:05 p.m.
Message ID <ca9d6015a0f2c8365636.1602605143@bearkhoff>
Download mbox | patch
Permalink /patch/47449/
State New
Headers show

Comments

Stéphane Blondon - Oct. 13, 2020, 4:05 p.m.
# HG changeset patch
# User "Stephane" <stephane@yaal.fr>
# Date 1602604771 -7200
#      Tue Oct 13 17:59:31 2020 +0200
# Node ID ca9d6015a0f2c8365636da5511c58a747d45ae35
# Parent  0cd22a550a68d30896374193fb4bfd1405cec843
Replace some subversion references by Git ones

Fixes: #6396
Manuel Jacob - Oct. 13, 2020, 6:30 p.m.
On 13/10/2020 18.05, Stephane Blondon wrote:
> # HG changeset patch
> # User "Stephane" <stephane@yaal.fr>
> # Date 1602604771 -7200
> #      Tue Oct 13 17:59:31 2020 +0200
> # Node ID ca9d6015a0f2c8365636da5511c58a747d45ae35
> # Parent  0cd22a550a68d30896374193fb4bfd1405cec843
> Replace some subversion references by Git ones
> 
> Fixes: #6396
> 
> diff -r 0cd22a550a68 -r ca9d6015a0f2 templates/about/index.html
> --- a/templates/about/index.html	Mon Oct 12 17:07:26 2020 +0200
> +++ b/templates/about/index.html	Tue Oct 13 17:59:31 2020 +0200
> @@ -24,7 +24,7 @@
>   
>   <h2>Easy to use</h2>
>   
> -<p>Mercurial sports a consistent command set in which most subversion users feel right at home. Potentially dangerous actions are available via extensions you need to enable, so the basic interface is easy to use, easy to learn and hard to break. The <a href="/quickstart">Quick Start</a> should get you going in a just few minutes.</p>
> +<p>Mercurial sports a consistent command set in which most Git users feel right at home. Potentially dangerous actions are available via extensions you need to enable, so the basic interface is easy to use, easy to learn and hard to break. The <a href="/quickstart">Quick Start</a> should get you going in a just few minutes.</p>

It seems to me like Mercurial’s command set followed Subversion’s 
command set, while Git’s command set is more different. Therefore, the 
change distorts the meaning of the sentence (similar in the sentence 
that is changed next in this patch).

The intention of this change is a good one. Nowadays, it makes more 
sense to compare to Git than to compare to Subversion. But 
unfortunately, this requires larger changes than just replacing 
"Subversion" with "Git".

>   <h2>Open Source</h2>
>   
> diff -r 0cd22a550a68 -r ca9d6015a0f2 templates/guide/index.html
> --- a/templates/guide/index.html	Mon Oct 12 17:07:26 2020 +0200
> +++ b/templates/guide/index.html	Tue Oct 13 17:59:31 2020 +0200
> @@ -16,7 +16,7 @@
>   
>   <div class="note">
>   <p class="note-title">Note:</p>
> -This guide doesn't require any prior knowledge of version control systems (though subversion users will likely feel at home quite quickly). Basic command line abilities are helpful, because we'll use the command line client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr -->
> +This guide doesn't require any prior knowledge of version control systems (though Git users will likely feel at home quite quickly). Basic command line abilities are helpful, because we'll use the command line client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr -->
>   </div>
>   <h1 id="basic_workflow">Basic workflows</h1>
>   
> diff -r 0cd22a550a68 -r ca9d6015a0f2 templates/quickstart/index.html
> --- a/templates/quickstart/index.html	Mon Oct 12 17:07:26 2020 +0200
> +++ b/templates/quickstart/index.html	Tue Oct 13 17:59:31 2020 +0200
> @@ -53,21 +53,15 @@
>   
>   </code></pre>
>   <p>I you want more than this quick overview, please have a look at our longer <a href="/guide">practical guide</a>. </p>
> -<h2>Part 2: Understanding Mercurial in 6 steps</h2>
> +<h2>Part 2: Understanding Mercurial in 5 steps</h2>
>   <p>Now we'll look at some of the basic concepts of Mercurial to get a better understanding of its internals: </p>
>   <ol class="undecorated_list">
>   <li>
> -<p>Like in Subversion, history consists of a number of commits. They're
> +<p>Like in Git (or Subversion), history consists of a number of commits. They're
>     called changesets in Mercurial.</p>
>   
>   </li><li>
> -<p>Subversion requires a strict linear ordering of the commits and
> -  gives nice linear revision numbers to them. So revision N has only
> -  one child revision, N+1. This is simple, but it requires a central server to make sure that
> -  everybody agrees on the revision numbers.</p>
> -
> -</li><li>
> -<p>Mercurial generalizes this by letting each changeset have multiple
> +<p>Like Git, Mercurial uses a directed acyclic graph to order the changesets. So each changeset can have multiple
>     children. If I work alone and make commits I'll make
>     <img src="/images/quickstart-c1.png" border="0"/><br />
>     by making three commits. </p>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Stéphane Blondon - Oct. 17, 2020, 7:11 p.m.
On 13/10/2020 20:30, Manuel Jacob wrote:
> On 13/10/2020 18.05, Stephane Blondon wrote:
>> # HG changeset patch
>> # User "Stephane" <stephane@yaal.fr>
>> # Date 1602604771 -7200
>> #      Tue Oct 13 17:59:31 2020 +0200
>> # Node ID ca9d6015a0f2c8365636da5511c58a747d45ae35
>> # Parent  0cd22a550a68d30896374193fb4bfd1405cec843
>> Replace some subversion references by Git ones
>>
>> Fixes: #6396
>>
>> diff -r 0cd22a550a68 -r ca9d6015a0f2 templates/about/index.html
>> --- a/templates/about/index.html    Mon Oct 12 17:07:26 2020 +0200
>> +++ b/templates/about/index.html    Tue Oct 13 17:59:31 2020 +0200
>> @@ -24,7 +24,7 @@
>>   <h2>Easy to use</h2>
>> -<p>Mercurial sports a consistent command set in which most subversion 
>> users feel right at home. Potentially dangerous actions are available 
>> via extensions you need to enable, so the basic interface is easy to 
>> use, easy to learn and hard to break. The <a href="/quickstart">Quick 
>> Start</a> should get you going in a just few minutes.</p>
>> +<p>Mercurial sports a consistent command set in which most Git users 
>> feel right at home. Potentially dangerous actions are available via 
>> extensions you need to enable, so the basic interface is easy to use, 
>> easy to learn and hard to break. The <a href="/quickstart">Quick 
>> Start</a> should get you going in a just few minutes.</p>
> 
> It seems to me like Mercurial’s command set followed Subversion’s 
> command set, while Git’s command set is more different. Therefore, the 
> change distorts the meaning of the sentence (similar in the sentence 
> that is changed next in this patch).

To start with Mercurial:
  - Subversion users had to learn about the local and the distant 
repositories (and the added commands).
  - Git users had to learn some command differences (pull vs fetch, 
checkout vs update). 'add', 'commit', 'merge' are the same commands.

IMO, it's not harder for Git users than Subversion ones, so the sentence 
is still valid.

If you're not convinced, do you prefer to replace:
'Mercurial sports a consistent command set in which most Git users feel 
right at home.'
by
'Like Git, Mercurial is a DVCS with a consistent command set.'

or we can simply remove the end of the sentence ('in which most Git 
users feel right at home').


Regards,
Stéphane

Patch

diff -r 0cd22a550a68 -r ca9d6015a0f2 templates/about/index.html
--- a/templates/about/index.html	Mon Oct 12 17:07:26 2020 +0200
+++ b/templates/about/index.html	Tue Oct 13 17:59:31 2020 +0200
@@ -24,7 +24,7 @@ 
 
 <h2>Easy to use</h2>
 
-<p>Mercurial sports a consistent command set in which most subversion users feel right at home. Potentially dangerous actions are available via extensions you need to enable, so the basic interface is easy to use, easy to learn and hard to break. The <a href="/quickstart">Quick Start</a> should get you going in a just few minutes.</p>
+<p>Mercurial sports a consistent command set in which most Git users feel right at home. Potentially dangerous actions are available via extensions you need to enable, so the basic interface is easy to use, easy to learn and hard to break. The <a href="/quickstart">Quick Start</a> should get you going in a just few minutes.</p>
 
 <h2>Open Source</h2>
 
diff -r 0cd22a550a68 -r ca9d6015a0f2 templates/guide/index.html
--- a/templates/guide/index.html	Mon Oct 12 17:07:26 2020 +0200
+++ b/templates/guide/index.html	Tue Oct 13 17:59:31 2020 +0200
@@ -16,7 +16,7 @@ 
 
 <div class="note">
 <p class="note-title">Note:</p>
-This guide doesn't require any prior knowledge of version control systems (though subversion users will likely feel at home quite quickly). Basic command line abilities are helpful, because we'll use the command line client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr -->
+This guide doesn't require any prior knowledge of version control systems (though Git users will likely feel at home quite quickly). Basic command line abilities are helpful, because we'll use the command line client. <!--If you already know other systems, please check our transition guides: svn, cvs, git, bzr -->
 </div>
 <h1 id="basic_workflow">Basic workflows</h1>
 
diff -r 0cd22a550a68 -r ca9d6015a0f2 templates/quickstart/index.html
--- a/templates/quickstart/index.html	Mon Oct 12 17:07:26 2020 +0200
+++ b/templates/quickstart/index.html	Tue Oct 13 17:59:31 2020 +0200
@@ -53,21 +53,15 @@ 
 
 </code></pre>
 <p>I you want more than this quick overview, please have a look at our longer <a href="/guide">practical guide</a>. </p>
-<h2>Part 2: Understanding Mercurial in 6 steps</h2>
+<h2>Part 2: Understanding Mercurial in 5 steps</h2>
 <p>Now we'll look at some of the basic concepts of Mercurial to get a better understanding of its internals: </p>
 <ol class="undecorated_list">
 <li>
-<p>Like in Subversion, history consists of a number of commits. They're
+<p>Like in Git (or Subversion), history consists of a number of commits. They're
   called changesets in Mercurial.</p>
 
 </li><li>
-<p>Subversion requires a strict linear ordering of the commits and
-  gives nice linear revision numbers to them. So revision N has only
-  one child revision, N+1. This is simple, but it requires a central server to make sure that
-  everybody agrees on the revision numbers.</p>
-
-</li><li>
-<p>Mercurial generalizes this by letting each changeset have multiple
+<p>Like Git, Mercurial uses a directed acyclic graph to order the changesets. So each changeset can have multiple
   children. If I work alone and make commits I'll make
   <img src="/images/quickstart-c1.png" border="0"/><br />
   by making three commits. </p>