From 44c7eaad2488effb691d4a0f4e9ded32c9ff360b Mon Sep 17 00:00:00 2001 From: Will L Fife Date: Sat, 27 Oct 2018 23:39:11 -0700 Subject: Add the distributed source control management tool mercurial. --- mercurial.html.markdown | 399 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 399 insertions(+) create mode 100644 mercurial.html.markdown (limited to 'mercurial.html.markdown') diff --git a/mercurial.html.markdown b/mercurial.html.markdown new file mode 100644 index 00000000..f7644f33 --- /dev/null +++ b/mercurial.html.markdown @@ -0,0 +1,399 @@ +--- +category: tool +tool: hg +contributors: + - ["Will L. Fife", "http://github.com/sarlalian"] +filename: LearnHG.txt +--- + +Mercurial is a free, distributed source control management tool. It offers you +the power to efficiently handle projects of any size while using an intuitive +interface. It is easy to use and hard to break, making it ideal for anyone +working with versioned files. + +## Versioning Concepts + +### What is version control? + +Version control is a system that records changes to a file(s), over time. + +### Centralized Versioning VS Distributed Versioning + + +* Centralized version control focuses on synchronizing, tracking, and backing +up files. +* Distributed version control focuses on sharing changes. Every change has a +unique id. +* Distributed systems have no defined structure. You could easily have a SVN +style, centralized system, with mercurial. + + +### Why Use Mercurial + +* Distributed Architecture +* Fast +* Platform Independent +* Extensible +* Easy to use +* Open Source + + +#### Distributed Architecture + +Traditional version control systems such as Subversion are typical +client-server architectures with a central server to store the revisions of a +project. In contrast, Mercurial is truly distributed, giving each developer a +local copy of the entire development history. This way it works independent of +network access or a central server. Committing, branching and merging are fast +and cheap. + + +#### Fast + +Mercurial's implementation and data structures are designed to be fast. You can +generate diffs between revisions, or jump back in time within seconds. +Therefore Mercurial is perfectly suitable for large projects such as OpenJDK +([hg](http://hg.openjdk.java.net/jdk7/jdk7)) or NetBeans +([hg](http://hg.netbeans.org/)). + +#### Platform Independent + +Mercurial was written with platform independence in mind. Therefore most of +Mercurial is written in Python, with a small part in portable C for performance +reasons. As a result, binary releases are available on all major platforms. + + +#### Extensible + +The functionality of Mercurial can be increased with extensions, either by +activating the official ones which are shipped with Mercurial or downloading +some [from the wiki](https://www.mercurial-scm.org/wiki/UsingExtensions) or by +[writing your own](https://www.mercurial-scm.org/wiki/WritingExtensions). +Extensions are written in Python and can change the workings of the basic +commands, add new commands and access all the core functions of Mercurial. + + +#### Easy to Use + +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 [Quick Start](https://www.mercurial-scm.org/quickstart) should +get you going in a just few minutes. + +#### Open Source + +Mercurial is free software licensed under the terms of the [GNU General Public +License Version 2](http://www.gnu.org/licenses/gpl-2.0.txt) or any later +version. + + +## Terminology + +| Term | Definition | +| ------------- | ---------------------------------- | +| Repository | Collection of revisions | +| hgrc | A file which stores defaults for a repository. Global is ~/.hgrc and local is .hgrc inside the repository | +| revision | Committed changeset, by REV number | +| changeset | Set of work changes saved as diffs | +| diff | Changes between files | +| tag | Name for a specific revision | +| parent(s) | Immediate ancestor(s) of revision or work | +| branch | Child of a revision | +| head | A head is a changeset with no child changesets | +| merge | The process of merging two HEADS | +| tip | Latest revision in any branch | +| patch | All diffs between two revisions | +| bundle | Patch with permis­sions and rename support | + + +## Commands + +### init + +Create a new repository in the given directory, the settings and stored +information are in a directory named ".hg" + +```bash +$ hg init +``` + +### help + +Will give you access to a very detailed description of each command. + +```bash +# Quickly check what commands are available +$ hg help + +# Get help on a specific command +# hg help +$ hg help add +$ hg help commit +$ hg help init +``` + +### status + +Show the differences between what is on disk and what is committed to the current +branch or tag. + + +```bash +# Will display the status of files +$ hg status + +# Get help on the status subcommand +$ hg help status + +``` + +### add + +Will add the specified files to the repository on the next commit + +```bash +# Add a file in the current directory +$ hg add filename.rb + +# Add a file in a sub directory +$ hg add foo/bar/filename.rb + +# Add files by pattern +$ hg add *.rb +``` + +### branch + +Set or show the current branch name + +*Branch names are permanent and global. Use 'hg bookmark' to create a +light-weight bookmark instead. See 'hg help glossary' for more information +about named branches and bookmarks.* + +```bash +# With no argument it shows the current branch name +$ hg branch + +# With a name argument it will change the current branch. +$ hg branch new_branch +marked working directory as branch new_branch +(branches are permanent and global, did you want a bookmark?) +``` + +### tag + +Add one or more tags for the current or given revision + +Tags are used to name particular revisions of the repository and are very +useful to compare different revisions, to go back to significant earlier +versions or to mark branch points as releases, etc. Changing an existing tag +is normally disallowed; use -f/--force to override. + +```bash +# List tags +$ hg tags +tip 2:efc8222cd1fb +v1.0 0:37e9b57123b3 + +# Create a new tag on the current revision +$ hg tag v1.1 + +# Create a tag on a specific revision +$ hg tag -r efc8222cd1fb v1.1.1 +``` + +### clone + +Create a copy of an existing repository in a new directory. + +If no destination directory name is specified, it defaults to the basename of +the source. + +```bash +# Clone a remote repo to a local directory +$ hg clone https://some-mercurial-server.example.com/reponame + +# Clone a local repo to a remote server +$ hg clone . ssh://username@some-mercurial-server.example.com/newrepo + +# Clone a local repo to a local repo +$ hg clone . /tmp/some_backup_dir +``` + +### commit / ci + +Commit changes to the given files into the repository. + +```bash +# Commit with a message +$ hg commit -m 'This is a commit message' + +# Commit all added / removed files in the currrent tree +$ hg commit -A 'Adding and removing all existing files in the tree' + +# amend the parent of the working directory with a new commit that contains the +# changes in the parent in addition to those currently reported by 'hg status', +$ hg commit --amend -m "Correct message" +``` + +### diff + +Show differences between revisions for the specified files using the unified diff format. + +```bash +# Show the diff between the current directory and a previous revision +$ hg diff -r 10 + +# Show the diff between two previous revisions +$ hg diff -r 30 -r 20 +``` + +### grep + +Search revision history for a pattern in specified files + +```bash +# Search files for a specific phrase +$ hg grep "TODO:" +``` + +### log / history + +Show revision history of entire repository or files. If no revision range is +specified, the default is "tip:0" unless --follow is set, in which case the +working directory parent is used as the starting revision. + +```bash +# Show the history of the entire repository +$ hg log + +# Show the history of a single file +$ hg log myfile.rb + +# Show the revision changes as an ASCII art DAG with the most recent changeset +# at the top. +$ hg log -G +``` + +### merge + +Merge another revision into working directory + +```bash +# Merge changesets to local repository +$ hg merge + +# Merge from a named branch or revision into the current local branch +$ hg merge branchname_or_revision + +# After successful merge, commit the changes +hg commit +``` + +### move / mv / rename + +Rename files; equivalent of copy + remove. Mark dest as copies of sources; +mark sources for deletion. If dest is a directory, copies are put in that +directory. If dest is a file, there can only be one source. + +```bash +# Rename a single file +$ hg mv foo.txt bar.txt + +# Rename a directory +$ hg mv some_directory new_directory +``` + +### pull + +Pull changes from a remote repository to a local one. + +```bash +# List remote paths +$ hg paths +remote1 = http://path/to/remote1 +remote2 = http://path/to/remote2 + +# Pull from remote 1 +$ hg pull remote1 + +# Pull from remote 2 +$ hg pull remote2 +``` + +### push + +Push changesets from the local repository to the specified destination. + +```bash +# List remote paths +$ hg paths +remote1 = http://path/to/remote1 +remote2 = http://path/to/remote2 + +# Pull from remote 1 +$ hg push remote1 + +# Pull from remote 2 +$ hg push remote2 +``` + +### rebase + +Move changeset (and descendants) to a different branch + +Rebase uses repeated merging to graft changesets from one part of history +(the source) onto another (the destination). This can be useful for +linearizing *local* changes relative to a master development tree. + +* Draft the commits back to the source revision. +* -s is the source, ie. what you are rebasing. +* -d is the destination, which is where you are sending it. + +```bash +# Put the commits into draft status +# This will draft all subsequent commits on the relevant branch +$ hg phase --draft --force -r 1206 + +# Rebase from from revision 102 over revision 208 +$ hg rebase -s 102 -d 208 +``` + +### revert + +Restore files to their checkout state. With no revision specified, revert the +specified files or directories to the contents they had in the parent of the +working directory. This restores the contents of files to an unmodified state +and unschedules adds, removes, copies, and renames. If the working directory +has two parents, you must explicitly specify a revision. + +```bash +# Reset a specific file to its checked out state +$ hg revert oops_i_did_it_again.txt + +# Revert a specific file to its checked out state without leaving a .orig file +# around +$ hg revert -C oops_i_did_it_again.txt + +# Revert all changes +$ hg revert -a +``` + +### rm / remove + +Remove the specified files on the next commit. + +```bash +# Remove a spcific file +$ hg remove go_away.txt + +# Remove a group of files by pattern +$ hg remove *.txt +``` + +## Further Information + +* [Learning Mercurial in Workflows](https://www.mercurial-scm.org/guid) +* [Mercurial Quick Start](https://www.mercurial-scm.org/wiki/QuickStart) +* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) \ No newline at end of file -- cgit v1.2.3 From f8a96c4889a600b8ffee918a3e2746fae35becc4 Mon Sep 17 00:00:00 2001 From: Will L Fife Date: Sat, 27 Oct 2018 23:56:48 -0700 Subject: Some additional changes to existing wording --- mercurial.html.markdown | 76 +++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 44 deletions(-) (limited to 'mercurial.html.markdown') diff --git a/mercurial.html.markdown b/mercurial.html.markdown index f7644f33..1d991384 100644 --- a/mercurial.html.markdown +++ b/mercurial.html.markdown @@ -6,26 +6,17 @@ contributors: filename: LearnHG.txt --- -Mercurial is a free, distributed source control management tool. It offers you -the power to efficiently handle projects of any size while using an intuitive -interface. It is easy to use and hard to break, making it ideal for anyone -working with versioned files. +Mercurial is a free, distributed source control management tool. It offers +you the power to efficiently handle projects of any size while using an +intuitive interface. It is easy to use and hard to break, making it ideal for +anyone working with versioned files. ## Versioning Concepts ### What is version control? -Version control is a system that records changes to a file(s), over time. - -### Centralized Versioning VS Distributed Versioning - - -* Centralized version control focuses on synchronizing, tracking, and backing -up files. -* Distributed version control focuses on sharing changes. Every change has a -unique id. -* Distributed systems have no defined structure. You could easily have a SVN -style, centralized system, with mercurial. +Version control is a system that keeps track fo changes to a set of file(s) +and/or directorie(s) over time. ### Why Use Mercurial @@ -40,27 +31,25 @@ style, centralized system, with mercurial. #### Distributed Architecture -Traditional version control systems such as Subversion are typical -client-server architectures with a central server to store the revisions of a -project. In contrast, Mercurial is truly distributed, giving each developer a -local copy of the entire development history. This way it works independent of -network access or a central server. Committing, branching and merging are fast -and cheap. +Traditionally version control systems such as CVS and Subversion are a client server +architecture with a central server to store the revsion history of a project. Mercurial however +is a truly distributed architecture, giving each devloper a full local copy of the entire +development history. It works independently of a central server. #### Fast -Mercurial's implementation and data structures are designed to be fast. You can -generate diffs between revisions, or jump back in time within seconds. -Therefore Mercurial is perfectly suitable for large projects such as OpenJDK -([hg](http://hg.openjdk.java.net/jdk7/jdk7)) or NetBeans +Mercurial is implemented to be fast. You are able to generate diffs between +revsions, and switch between tags and branches with little time and effort. +Mercurial is used by large projects such as OpenJDK +([hg](http://hg.openjdk.java.net/jdk7/jdk7)) and NetBeans ([hg](http://hg.netbeans.org/)). #### Platform Independent -Mercurial was written with platform independence in mind. Therefore most of -Mercurial is written in Python, with a small part in portable C for performance -reasons. As a result, binary releases are available on all major platforms. +Mercurial was written to be highly platform independent. Much of Mercurial is +written in Python, with small performance critical parts written in portable +C. Binary releases are available for all major platforms. #### Extensible @@ -75,11 +64,10 @@ commands, add new commands and access all the core functions of Mercurial. #### Easy to Use -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 [Quick Start](https://www.mercurial-scm.org/quickstart) should -get you going in a just few minutes. +The Mercurial command set is consistent with what subversion users would +expect, so they are likely to feel right at home. Most dangerous actions +are part of extensions that need to be enabled to be used. + #### Open Source @@ -92,18 +80,18 @@ version. | Term | Definition | | ------------- | ---------------------------------- | -| Repository | Collection of revisions | -| hgrc | A file which stores defaults for a repository. Global is ~/.hgrc and local is .hgrc inside the repository | -| revision | Committed changeset, by REV number | -| changeset | Set of work changes saved as diffs | -| diff | Changes between files | -| tag | Name for a specific revision | -| parent(s) | Immediate ancestor(s) of revision or work | -| branch | Child of a revision | +| Repository | A repository is a collection of revisions | +| hgrc | A configuration file which stores the defaults for a repository. | +| revision | A committed changeset: has a REV number | +| changeset | Set of changes saved as diffs | +| diff | Changes between file(s) | +| tag | A named named revision | +| parent(s) | Immediate ancestor(s) of a revison | +| branch | A child of a revision | | head | A head is a changeset with no child changesets | -| merge | The process of merging two HEADS | -| tip | Latest revision in any branch | -| patch | All diffs between two revisions | +| merge | The process of merging two HEADS | +| tip | The latest revision in any branch | +| patch | All of the diffs between two revisions | | bundle | Patch with permis­sions and rename support | -- cgit v1.2.3 From cc2b3dca73edfb6231a79bf483730af28e7a99d7 Mon Sep 17 00:00:00 2001 From: Will Fife Date: Sun, 28 Oct 2018 00:19:49 -0700 Subject: Update mercurial.html.markdown --- mercurial.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mercurial.html.markdown') diff --git a/mercurial.html.markdown b/mercurial.html.markdown index 1d991384..f757dd7c 100644 --- a/mercurial.html.markdown +++ b/mercurial.html.markdown @@ -2,7 +2,7 @@ category: tool tool: hg contributors: - - ["Will L. Fife", "http://github.com/sarlalian"] + - ["Will L. Fife", "http://github.com/sarlalian"] filename: LearnHG.txt --- @@ -384,4 +384,4 @@ $ hg remove *.txt * [Learning Mercurial in Workflows](https://www.mercurial-scm.org/guid) * [Mercurial Quick Start](https://www.mercurial-scm.org/wiki/QuickStart) -* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) \ No newline at end of file +* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) -- cgit v1.2.3 From 7825aa838433851d03c393bceb06716bdcfafb66 Mon Sep 17 00:00:00 2001 From: Will L Fife Date: Sun, 28 Oct 2018 11:31:13 -0700 Subject: Multiple changes - Remove double newlines - Merge lists - fix locations where lines are > 80 chars. - Remove excess whitespace in table --- mercurial.html.markdown | 122 +++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 73 deletions(-) (limited to 'mercurial.html.markdown') diff --git a/mercurial.html.markdown b/mercurial.html.markdown index f757dd7c..d1cac66c 100644 --- a/mercurial.html.markdown +++ b/mercurial.html.markdown @@ -18,82 +18,58 @@ anyone working with versioned files. Version control is a system that keeps track fo changes to a set of file(s) and/or directorie(s) over time. - ### Why Use Mercurial -* Distributed Architecture -* Fast -* Platform Independent -* Extensible -* Easy to use -* Open Source - - -#### Distributed Architecture - -Traditionally version control systems such as CVS and Subversion are a client server -architecture with a central server to store the revsion history of a project. Mercurial however -is a truly distributed architecture, giving each devloper a full local copy of the entire -development history. It works independently of a central server. - - -#### Fast - -Mercurial is implemented to be fast. You are able to generate diffs between -revsions, and switch between tags and branches with little time and effort. -Mercurial is used by large projects such as OpenJDK -([hg](http://hg.openjdk.java.net/jdk7/jdk7)) and NetBeans -([hg](http://hg.netbeans.org/)). - -#### Platform Independent - -Mercurial was written to be highly platform independent. Much of Mercurial is -written in Python, with small performance critical parts written in portable -C. Binary releases are available for all major platforms. - - -#### Extensible - -The functionality of Mercurial can be increased with extensions, either by -activating the official ones which are shipped with Mercurial or downloading -some [from the wiki](https://www.mercurial-scm.org/wiki/UsingExtensions) or by -[writing your own](https://www.mercurial-scm.org/wiki/WritingExtensions). -Extensions are written in Python and can change the workings of the basic -commands, add new commands and access all the core functions of Mercurial. - - -#### Easy to Use - -The Mercurial command set is consistent with what subversion users would -expect, so they are likely to feel right at home. Most dangerous actions -are part of extensions that need to be enabled to be used. - - -#### Open Source - -Mercurial is free software licensed under the terms of the [GNU General Public -License Version 2](http://www.gnu.org/licenses/gpl-2.0.txt) or any later -version. - +* Distributed Architecture - Traditionally version control systems such as CVS +and Subversion are a client server architecture with a central server to +store the revsion history of a project. Mercurial however is a truly +distributed architecture, giving each devloper a full local copy of the +entire development history. It works independently of a central server. + +* Fast - Traditionally version control systems such as CVS and Subversion are a +client server architecture with a central server to store the revsion history +of a project. Mercurial however is a truly distributed architecture, giving +each devloper a full local copy of the entire development history. It works +independently of a central server. + +* Platform Independent - Mercurial was written to be highly platform +independent. Much of Mercurial is written in Python, with small performance +critical parts written in portable C. Binary releases are available for all +major platforms. + +* Extensible - The functionality of Mercurial can be increased with extensions, +either by activating the official ones which are shipped with Mercurial or +downloading some [from the +wiki](https://www.mercurial-scm.org/wiki/UsingExtensions) or by [writing your +own](https://www.mercurial-scm.org/wiki/WritingExtensions). Extensions are +written in Python and can change the workings of the basic commands, add new +commands and access all the core functions of Mercurial. + +* Easy to use - The Mercurial command set is consistent with what subversion +users would expect, so they are likely to feel right at home. Most dangerous +actions are part of extensions that need to be enabled to be used. + +* Open Source - Mercurial is free software licensed under the terms of the [GNU +General Public License Version 2](http://www.gnu.org/licenses/gpl-2.0.txt) or +any later version. ## Terminology -| Term | Definition | +| Term | Definition | | ------------- | ---------------------------------- | -| Repository | A repository is a collection of revisions | -| hgrc | A configuration file which stores the defaults for a repository. | -| revision | A committed changeset: has a REV number | -| changeset | Set of changes saved as diffs | -| diff | Changes between file(s) | -| tag | A named named revision | -| parent(s) | Immediate ancestor(s) of a revison | -| branch | A child of a revision | -| head | A head is a changeset with no child changesets | -| merge | The process of merging two HEADS | -| tip | The latest revision in any branch | -| patch | All of the diffs between two revisions | -| bundle | Patch with permis­sions and rename support | - +| Repository | A repository is a collection of revisions | +| hgrc | A configuration file which stores the defaults for a repository. | +| revision | A committed changeset: has a REV number | +| changeset | Set of changes saved as diffs | +| diff | Changes between file(s) | +| tag | A named named revision | +| parent(s) | Immediate ancestor(s) of a revison | +| branch | A child of a revision | +| head | A head is a changeset with no child changesets | +| merge | The process of merging two HEADS | +| tip | The latest revision in any branch | +| patch | All of the diffs between two revisions | +| bundle | Patch with permis­sions and rename support | ## Commands @@ -133,7 +109,6 @@ $ hg status # Get help on the status subcommand $ hg help status - ``` ### add @@ -227,7 +202,8 @@ $ hg commit --amend -m "Correct message" ### diff -Show differences between revisions for the specified files using the unified diff format. +Show differences between revisions for the specified files using the unified +diff format. ```bash # Show the diff between the current directory and a previous revision @@ -384,4 +360,4 @@ $ hg remove *.txt * [Learning Mercurial in Workflows](https://www.mercurial-scm.org/guid) * [Mercurial Quick Start](https://www.mercurial-scm.org/wiki/QuickStart) -* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) +* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) \ No newline at end of file -- cgit v1.2.3 From bf6be6f4dd91bdf1a829359a379a8181f261aaef Mon Sep 17 00:00:00 2001 From: Divay Prakash Date: Wed, 31 Oct 2018 02:29:41 +0530 Subject: [mercurial/en] Multiple fixes (#3355) * Fix filename and doc title * Remove unecessary newlines, fix line length * Correct doc name capitalization, add periods * Fix subhead capitalization --- mercurial.html.markdown | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) (limited to 'mercurial.html.markdown') diff --git a/mercurial.html.markdown b/mercurial.html.markdown index d1cac66c..330beb35 100644 --- a/mercurial.html.markdown +++ b/mercurial.html.markdown @@ -1,9 +1,9 @@ --- category: tool -tool: hg +tool: Mercurial contributors: - ["Will L. Fife", "http://github.com/sarlalian"] -filename: LearnHG.txt +filename: LearnMercurial.txt --- Mercurial is a free, distributed source control management tool. It offers @@ -18,37 +18,30 @@ anyone working with versioned files. Version control is a system that keeps track fo changes to a set of file(s) and/or directorie(s) over time. -### Why Use Mercurial +### Why use Mercurial? * Distributed Architecture - Traditionally version control systems such as CVS and Subversion are a client server architecture with a central server to store the revsion history of a project. Mercurial however is a truly distributed architecture, giving each devloper a full local copy of the entire development history. It works independently of a central server. - * Fast - Traditionally version control systems such as CVS and Subversion are a client server architecture with a central server to store the revsion history of a project. Mercurial however is a truly distributed architecture, giving each devloper a full local copy of the entire development history. It works independently of a central server. - * Platform Independent - Mercurial was written to be highly platform independent. Much of Mercurial is written in Python, with small performance critical parts written in portable C. Binary releases are available for all major platforms. - * Extensible - The functionality of Mercurial can be increased with extensions, either by activating the official ones which are shipped with Mercurial or -downloading some [from the -wiki](https://www.mercurial-scm.org/wiki/UsingExtensions) or by [writing your -own](https://www.mercurial-scm.org/wiki/WritingExtensions). Extensions are -written in Python and can change the workings of the basic commands, add new -commands and access all the core functions of Mercurial. - +downloading some [from the wiki](https://www.mercurial-scm.org/wiki/UsingExtensions) or by [writing your own](https://www.mercurial-scm.org/wiki/WritingExtensions). Extensions are written in +Python and can change the workings of the basic commands, add new commands and +access all the core functions of Mercurial. * Easy to use - The Mercurial command set is consistent with what subversion users would expect, so they are likely to feel right at home. Most dangerous actions are part of extensions that need to be enabled to be used. - * Open Source - Mercurial is free software licensed under the terms of the [GNU General Public License Version 2](http://www.gnu.org/licenses/gpl-2.0.txt) or any later version. @@ -76,7 +69,7 @@ any later version. ### init Create a new repository in the given directory, the settings and stored -information are in a directory named ".hg" +information are in a directory named `.hg`. ```bash $ hg init @@ -102,7 +95,6 @@ $ hg help init Show the differences between what is on disk and what is committed to the current branch or tag. - ```bash # Will display the status of files $ hg status @@ -113,7 +105,7 @@ $ hg help status ### add -Will add the specified files to the repository on the next commit +Will add the specified files to the repository on the next commit. ```bash # Add a file in the current directory @@ -128,7 +120,7 @@ $ hg add *.rb ### branch -Set or show the current branch name +Set or show the current branch name. *Branch names are permanent and global. Use 'hg bookmark' to create a light-weight bookmark instead. See 'hg help glossary' for more information @@ -146,7 +138,7 @@ marked working directory as branch new_branch ### tag -Add one or more tags for the current or given revision +Add one or more tags for the current or given revision. Tags are used to name particular revisions of the repository and are very useful to compare different revisions, to go back to significant earlier @@ -215,7 +207,7 @@ $ hg diff -r 30 -r 20 ### grep -Search revision history for a pattern in specified files +Search revision history for a pattern in specified files. ```bash # Search files for a specific phrase @@ -242,7 +234,7 @@ $ hg log -G ### merge -Merge another revision into working directory +Merge another revision into working directory. ```bash # Merge changesets to local repository @@ -305,7 +297,7 @@ $ hg push remote2 ### rebase -Move changeset (and descendants) to a different branch +Move changeset (and descendants) to a different branch. Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be useful for @@ -356,7 +348,7 @@ $ hg remove go_away.txt $ hg remove *.txt ``` -## Further Information +## Further information * [Learning Mercurial in Workflows](https://www.mercurial-scm.org/guid) * [Mercurial Quick Start](https://www.mercurial-scm.org/wiki/QuickStart) -- cgit v1.2.3 From 55ec5c541476ec9faf51226f5e901a766fa88776 Mon Sep 17 00:00:00 2001 From: Fasermaler <41094233+Fasermaler@users.noreply.github.com> Date: Tue, 13 Aug 2019 17:22:11 +0800 Subject: [mercurial/en] Fix mercurial workflow link --- mercurial.html.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mercurial.html.markdown') diff --git a/mercurial.html.markdown b/mercurial.html.markdown index 330beb35..98658f83 100644 --- a/mercurial.html.markdown +++ b/mercurial.html.markdown @@ -350,6 +350,6 @@ $ hg remove *.txt ## Further information -* [Learning Mercurial in Workflows](https://www.mercurial-scm.org/guid) +* [Learning Mercurial in Workflows](https://www.mercurial-scm.org/guide) * [Mercurial Quick Start](https://www.mercurial-scm.org/wiki/QuickStart) -* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) \ No newline at end of file +* [Mercurial: The Definitive Guide by Bryan O'Sullivan](http://hgbook.red-bean.com/) -- cgit v1.2.3