Mercurial > hg-website
annotate text/Main.txt @ 133:5e1cff189630
learning in workflows: Fix: Moved the resolve explanation to the first mention of resolve.
author | Arne Babenhauserheide <bab@draketo.de> |
---|---|
date | Fri, 01 May 2009 14:01:08 +0200 |
parents | 7b2d898ec15a |
children |
rev | line source |
---|---|
2
4464db954ebe
Added a file for the main page
Arne Babenhauserheide <bab@draketo.de>
parents:
diff
changeset
|
1 Main page |
4464db954ebe
Added a file for the main page
Arne Babenhauserheide <bab@draketo.de>
parents:
diff
changeset
|
2 ========= |
4464db954ebe
Added a file for the main page
Arne Babenhauserheide <bab@draketo.de>
parents:
diff
changeset
|
3 |
3 | 4 Mercurial is... |
5 --------------- | |
6 | |
10
e1520f56951c
about: Added an 'extensible' section. Also did some polishing.
Arne Babenhauserheide <bab@draketo.de>
parents:
9
diff
changeset
|
7 Mercurial is a free, distributed source control management tool. It offers you the power to efficiently handle projects of any size yet provides an easy, intuitive interface. |
4
ee901315cf85
Reworked Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
3
diff
changeset
|
8 |
10
e1520f56951c
about: Added an 'extensible' section. Also did some polishing.
Arne Babenhauserheide <bab@draketo.de>
parents:
9
diff
changeset
|
9 Every Mercurial clone is a full-fledged repository with complete history and revision tracking capabilities. It is independent of network access or a central server. Committing, branching and merging are fast and cheap. |
3 | 10 |
10
e1520f56951c
about: Added an 'extensible' section. Also did some polishing.
Arne Babenhauserheide <bab@draketo.de>
parents:
9
diff
changeset
|
11 Mercurial is used for version control of files, much like tools such as [Git](http://git-scm.org), [Bazaar](http://bazaar-vcs.org), [Subversion](http://subversion.tigris.org/) and [CVS](http://www.nongnu.org/cvs/). It is written in Python and available on many different platforms, including Microsoft Windows, Mac OS X, Linux, FreeBSD and OpenSolaris. |
3 | 12 |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
13 |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
14 Projects using Mercurial |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
15 ------------------------ |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
16 |
8
094be09b1c5d
Added 7 Projects which use Mercurial.
Arne Babenhauserheide <bab@draketo.de>
parents:
7
diff
changeset
|
17 * [Mercurial](http://selenic.com/repo/hg) |
094be09b1c5d
Added 7 Projects which use Mercurial.
Arne Babenhauserheide <bab@draketo.de>
parents:
7
diff
changeset
|
18 * [Mozilla](http://hg.mozilla.org/) |
094be09b1c5d
Added 7 Projects which use Mercurial.
Arne Babenhauserheide <bab@draketo.de>
parents:
7
diff
changeset
|
19 * [Cython](http://hg.cython.org/) |
094be09b1c5d
Added 7 Projects which use Mercurial.
Arne Babenhauserheide <bab@draketo.de>
parents:
7
diff
changeset
|
20 * [MoinMoin](http://hg.moinmo.in/) |
094be09b1c5d
Added 7 Projects which use Mercurial.
Arne Babenhauserheide <bab@draketo.de>
parents:
7
diff
changeset
|
21 * [OpenJDK](http://hg.openjdk.java.net/) |
094be09b1c5d
Added 7 Projects which use Mercurial.
Arne Babenhauserheide <bab@draketo.de>
parents:
7
diff
changeset
|
22 * [NetBeans](http://hg.netbeans.org/) |
16
bcd2e95a6c8e
Naming. It's OpenSolaris not Open Solaris
David Soria Parra <dsp@php.net>
parents:
15
diff
changeset
|
23 * [OpenSolaris](http://hg.genunix.org/) |
8
094be09b1c5d
Added 7 Projects which use Mercurial.
Arne Babenhauserheide <bab@draketo.de>
parents:
7
diff
changeset
|
24 |
9 | 25 [and many more](http://www.selenic.com/mercurial/wiki/index.cgi/ProjectsUsingMercurial) |
26 | |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
27 |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
28 How you can benefit from using Mercurial |
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
29 ---------------------------------------- |
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
30 |
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
31 ### Power and speed |
12
f75b80086a75
Benefit: Power, ease, serve.
Arne Babenhauserheide <bab@draketo.de>
parents:
11
diff
changeset
|
32 Mercurial offers you the power and speed to efficiently handle projects of any size and kind. You can use a multitude of [workflows]() and enhance its functionality with [extensions](). |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
33 |
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
34 ### Ease of use |
20 | 35 Mercurials consistent and intuitive interface makes it easy to learn and understand. You can simply start with the [bare basics][] and learn incrementally or print a copy of the [hgbook]() to understand the big picture in one go. |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
36 |
14
d6ddddb01053
Readded 'just works' to benefits.
Arne Babenhauserheide <bab@draketo.de>
parents:
13
diff
changeset
|
37 ### Just works |
20 | 38 Mercurial strives to deliver on each of its promises. Most tasks just work on the first try and without requiring arcane knowledge. (If one doesn't, that's most likely no feature but a [bug](http://selenic.com/mercurial/bugs/). |
14
d6ddddb01053
Readded 'just works' to benefits.
Arne Babenhauserheide <bab@draketo.de>
parents:
13
diff
changeset
|
39 |
12
f75b80086a75
Benefit: Power, ease, serve.
Arne Babenhauserheide <bab@draketo.de>
parents:
11
diff
changeset
|
40 [bare basics]: Quick_Start - Learn to use Mercurial in 30 seconds (or similar). |
f75b80086a75
Benefit: Power, ease, serve.
Arne Babenhauserheide <bab@draketo.de>
parents:
11
diff
changeset
|
41 |
15
39d078a6e4ae
Moved hg serve as suggestion to quick start.
Arne Babenhauserheide <bab@draketo.de>
parents:
14
diff
changeset
|
42 (just works instead of webserver: webserver can far more easily be delivered by other projects, too. Just works better fits the "hg is powerful yet easy" theme -> Integrated webserver into quick start?) |
39d078a6e4ae
Moved hg serve as suggestion to quick start.
Arne Babenhauserheide <bab@draketo.de>
parents:
14
diff
changeset
|
43 |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
44 |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
45 Get Mercurial |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
46 ------------- |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
47 |
7 | 48 If you're using Windows, download TortoiseHG for full Explorer integration. ![TortoiseHG Logo]() |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
49 |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
50 GNU/Linux: Just [get it from your package manager](link to a simple guide for the different distros). |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
51 |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
52 MacOSX: Download (app). |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
53 |
12
f75b80086a75
Benefit: Power, ease, serve.
Arne Babenhauserheide <bab@draketo.de>
parents:
11
diff
changeset
|
54 -> A "news" link should be alongside the version. This makes the site itneresting to returning visitors. |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
55 |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
56 |
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
57 Mercurial Quick Start |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
58 --------------------- |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
59 |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
60 Clone a project and create a patch |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
61 |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
62 $ hg clone http://bitbucket.org/ArneBab/hello_world |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
63 $ cd hello_world |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
64 $ (edit files) |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
65 $ hg add (new files) |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
66 $ hg commit -m 'My changes' |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
67 $ hg export > patch.diff |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
68 |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
69 Create a project and commit |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
70 |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
71 $ hg init (project-directory) |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
72 $ (add some files) |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
73 $ hg add |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
74 $ hg commit -m 'Initial commit' |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
75 |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
76 -> [Workflows]() |
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
77 |
20 | 78 (maybe instead of "Take a look"; it would be great to be able to [detect the OS](http://www.javascripter.net/faq/operatin.htm) of the visitor and show Windows users TortoiseHG while showing MacOSX and GNU/Linux users the Quick Start: ) |
11
66f237705694
Started with adapting the Main.txt to the design.
Arne Babenhauserheide <bab@draketo.de>
parents:
10
diff
changeset
|
79 |
15
39d078a6e4ae
Moved hg serve as suggestion to quick start.
Arne Babenhauserheide <bab@draketo.de>
parents:
14
diff
changeset
|
80 (### Integrated webserver |
39d078a6e4ae
Moved hg serve as suggestion to quick start.
Arne Babenhauserheide <bab@draketo.de>
parents:
14
diff
changeset
|
81 With the "serve" command, Mercurial offers you an integrated webserver as the fastest way to show and share your work.) |
9 | 82 |
5
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
83 Footer |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
84 ------ |
63915af14173
Main page: Added draft for Get Mercurial and Quick Start. Also did some reworking of Mercurial is...
Arne Babenhauserheide <bab@draketo.de>
parents:
4
diff
changeset
|
85 |