author | Pierre-Yves David <pierre-yves.david@octobus.net> |
Mon, 04 Sep 2017 12:19:49 +0200 | |
changeset 2914 | 9897babc1fb5 |
parent 2896 | 462adae9fea7 |
child 2950 | 1b4c92621e23 |
permissions | -rw-r--r-- |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 |
============== |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 |
Topic Tutorial |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 |
============== |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 |
|
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
5 |
This Mercurial configuration example is used for testing. |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 |
|
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
7 |
.. Various setup |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 |
|
2045
db617700d318
tests: move "test setup" script into a 'testlib' directory
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2014
diff
changeset
|
9 |
$ . "$TESTDIR/testlib/topic_setup.sh" |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
10 |
$ cat >> $HGRCPATH << EOF |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
11 |
> [experimental] |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
12 |
> evolution=all |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
13 |
> [extensions] |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
14 |
> evolve= |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
15 |
> EOF |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
16 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
$ hg init server |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
18 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 |
$ cd server |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
20 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 |
$ cat >> .hg/hgrc << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 |
> [ui] |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 |
> user= Shopping Master |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 |
> EOF |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
25 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 |
$ cat >> shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
27 |
> Spam |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 |
> Whizzo butter |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 |
> Albatross |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 |
> Rat (rather a lot) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 |
> Jugged fish |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 |
> Blancmange |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 |
> Salmon mousse |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 |
> EOF |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
35 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 |
$ hg commit -A -m "Shopping list" |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
37 |
adding shopping |
2826
93588d219f2f
doc: various little improvements for rst export
Boris Feld <boris.feld@octobus.net>
parents:
2825
diff
changeset
|
38 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
39 |
$ cd .. |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 |
$ hg clone server client |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 |
updating to branch default |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 |
$ cd client |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 |
$ cat >> .hg/hgrc << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
45 |
> [ui] |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
46 |
> user= Tutorial User |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 |
> EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
48 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
49 |
Topic branches are lightweight branches which disappear when changes are |
2885 | 50 |
finalized (moved to the public phase). They can help users to organize and share |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
51 |
their unfinished work. |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
52 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
53 |
Topic Basics |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
54 |
============ |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
55 |
|
2825 | 56 |
Let's say we use Mercurial to manage our shopping list: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
57 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
58 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
59 |
@ changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
60 |
tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
61 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
62 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
63 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
64 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
65 |
|
2885 | 66 |
We are about to make some additions to this list and would like to do them |
2825 | 67 |
within a topic. Creating a new topic is done using the ``topic`` command: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
68 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
69 |
$ hg topic food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
70 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
71 |
Much like a named branch, our topic is active but it does not contain any |
2885 | 72 |
changeset yet: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
74 |
$ hg topic |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
75 |
* food |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
76 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
77 |
$ hg summary |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
78 |
parent: 0:38da43f0a2ea tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
79 |
Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
80 |
branch: default |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
81 |
commit: (clean) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
82 |
update: (current) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
83 |
topic: food |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
84 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
85 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
86 |
@ changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
87 |
tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
88 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
89 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
90 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
91 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
92 |
|
2825 | 93 |
Our next commit will be part of the active topic: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
94 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
95 |
$ cat >> shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
96 |
> Egg |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
97 |
> Suggar |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
98 |
> Vinegar |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
99 |
> Oil |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
100 |
> EOF |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
101 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
102 |
$ hg commit -m "adding condiments" |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
103 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
104 |
$ hg log --graph --rev 'topic("food")' |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
105 |
@ changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
106 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
107 |
~ topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
108 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
109 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
110 |
summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
111 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
112 |
|
2825 | 113 |
And future commits will be part of that topic too: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
114 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
115 |
$ cat >> shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
116 |
> Bananas |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
117 |
> Pear |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
118 |
> Apple |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
119 |
> EOF |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
120 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
121 |
$ hg commit -m "adding fruits" |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
122 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
123 |
$ hg log --graph --rev 'topic("food")' |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
124 |
@ changeset: 2:287de11b401f |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
125 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
126 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
127 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
128 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
129 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
130 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
131 |
o changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
132 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
133 |
~ user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
134 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
135 |
summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
136 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
137 |
|
2721
c3a29c7abbee
tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2720
diff
changeset
|
138 |
We can get a compact view of the content of our topic using the ``stack`` |
2825 | 139 |
command: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
140 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
141 |
$ hg stack |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
142 |
### topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
143 |
### branch: default |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
144 |
t2@ adding fruits (current) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
145 |
t1: adding condiments |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2679
diff
changeset
|
146 |
t0^ Shopping list (base) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
147 |
|
2825 | 148 |
The topic deactivates when we update away from it: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
149 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
150 |
$ hg update default |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
151 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
152 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
153 |
$ hg topic |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
154 |
food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
155 |
|
2721
c3a29c7abbee
tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2720
diff
changeset
|
156 |
Note that ``default`` (name of the branch) now refers to the tipmost |
2825 | 157 |
changeset of default without a topic: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
158 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
159 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
160 |
o changeset: 2:287de11b401f |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
161 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
162 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
163 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
164 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
165 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
166 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
167 |
o changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
168 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
169 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
170 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
171 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
172 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
173 |
@ changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
174 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
175 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
176 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
177 |
|
2825 | 178 |
And updating back to the topic reactivates it: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
179 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
180 |
$ hg update food |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
181 |
switching to topic food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
182 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
183 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
184 |
$ hg topic |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
185 |
* food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
186 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
187 |
Updating to any changeset that is part of a topic activates the topic |
2825 | 188 |
regardless of how the revision was specified: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
189 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
190 |
$ hg update default |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
191 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
192 |
|
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
193 |
$ hg update --rev 'desc("condiments")' |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
194 |
switching to topic food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
195 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
196 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
197 |
$ hg topic |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
198 |
* food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
199 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
200 |
.. Server side activity: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
201 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
202 |
$ cd ../server/ |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
203 |
$ cat > shopping << EOF |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
204 |
> T-Shirt |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
205 |
> Trousers |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
206 |
> Spam |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
207 |
> Whizzo butter |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
208 |
> Albatross |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
209 |
> Rat (rather a lot) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
210 |
> Jugged fish |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
211 |
> Blancmange |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
212 |
> Salmon mousse |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
213 |
> EOF |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
214 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
215 |
$ hg commit -A -m "Adding clothes" |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
216 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
217 |
$ cd ../client |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
218 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
219 |
The topic will also affect the rebase and the merge destinations. Let's pull |
2825 | 220 |
the latest update from the main server: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
221 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
222 |
$ hg pull |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
223 |
pulling from $TESTTMP/server (glob) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
224 |
searching for changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
225 |
adding changesets |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
226 |
adding manifests |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
227 |
adding file changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
228 |
added 1 changesets with 1 changes to 1 files (+1 heads) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
229 |
(run 'hg heads' to see heads) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
230 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
231 |
$ hg log -G |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
232 |
o changeset: 3:6104862e8b84 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
233 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
234 |
| parent: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
235 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
236 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
237 |
| summary: Adding clothes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
238 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
239 |
| o changeset: 2:287de11b401f |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
240 |
| | topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
241 |
| | user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
242 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
243 |
| | summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
244 |
| | |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
245 |
| @ changeset: 1:13900241408b |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
246 |
|/ topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
247 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
248 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
249 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
250 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
251 |
o changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
252 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
253 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
254 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
255 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
256 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
257 |
The topic head will not be considered when merging from the new head of the |
2825 | 258 |
branch: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
259 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
260 |
$ hg update default |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
261 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
262 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
263 |
$ hg merge |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
264 |
abort: branch 'default' has one head - please merge with an explicit rev |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
265 |
(run 'hg heads' to see all heads) |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
266 |
[255] |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
267 |
|
2825 | 268 |
But the topic will see that branch head as a valid destination: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
269 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
270 |
$ hg update food |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
271 |
switching to topic food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
272 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
273 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
274 |
$ hg rebase |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
275 |
rebasing 1:13900241408b "adding condiments" |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
276 |
merging shopping |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
277 |
switching to topic food |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
278 |
rebasing 2:287de11b401f "adding fruits" |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
279 |
merging shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
280 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
281 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
282 |
@ changeset: 5:2d50db8b5b4c |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
283 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
284 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
285 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
286 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
287 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
288 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
289 |
o changeset: 4:4011b46eeb33 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
290 |
| topic: food |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
291 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
292 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
293 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
294 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
295 |
o changeset: 3:6104862e8b84 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
296 |
| parent: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
297 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
298 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
299 |
| summary: Adding clothes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
300 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
301 |
o changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
302 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
303 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
304 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
305 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
306 |
|
2825 | 307 |
The topic information will disappear when we publish the changesets: |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
308 |
|
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
309 |
$ hg topic |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
310 |
* food |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
311 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
312 |
$ hg push |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
313 |
pushing to $TESTTMP/server (glob) |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
314 |
searching for changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
315 |
adding changesets |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
316 |
adding manifests |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
317 |
adding file changes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
318 |
added 2 changesets with 2 changes to 1 files |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
319 |
2 new obsolescence markers |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
320 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
321 |
$ hg topic |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
322 |
* food |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
323 |
|
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
324 |
$ hg log --graph |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
325 |
@ changeset: 5:2d50db8b5b4c |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
326 |
| tag: tip |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
327 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
328 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
329 |
| summary: adding fruits |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
330 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
331 |
o changeset: 4:4011b46eeb33 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
332 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
333 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
334 |
| summary: adding condiments |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
335 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
336 |
o changeset: 3:6104862e8b84 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
337 |
| parent: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
338 |
| user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
339 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
340 |
| summary: Adding clothes |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
341 |
| |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
342 |
o changeset: 0:38da43f0a2ea |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
343 |
user: test |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
344 |
date: Thu Jan 01 00:00:00 1970 +0000 |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
345 |
summary: Shopping list |
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
346 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
347 |
$ hg update default |
2013
2e8e4619a240
tutorial: add a first version of the tutorial with the basics
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
348 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
349 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
350 |
Working with Multiple Topics |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
351 |
============================ |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
352 |
|
2885 | 353 |
In the above example, topics do not bring much benefits since you only have one |
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
354 |
line of development. Topics start to be more useful when you have to work on |
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
355 |
multiple features at the same time. |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
356 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
357 |
We might go shopping in a hardware store in the same go, so let's add some |
2825 | 358 |
tools to the shopping list within a new topic: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
359 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
360 |
$ hg topic tools |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
361 |
$ echo hammer >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
362 |
$ hg commit -m 'Adding hammer' |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
363 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
364 |
$ echo saw >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
365 |
$ hg commit -m 'Adding saw' |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
366 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
367 |
$ echo drill >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
368 |
$ hg commit -m 'Adding drill' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
369 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
370 |
But we are not sure we will actually go to the hardware store, so in the |
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
371 |
meantime, we want to extend the list with drinks. We go back to the official |
2825 | 372 |
default branch and start a new topic: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
373 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
374 |
$ hg update default |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
375 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
376 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
377 |
$ hg topic drinks |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
378 |
$ echo 'apple juice' >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
379 |
$ hg commit -m 'Adding apple juice' |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
380 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
381 |
$ echo 'orange juice' >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
382 |
$ hg commit -m 'Adding orange juice' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
383 |
|
2825 | 384 |
We now have two topics: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
385 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
386 |
$ hg topic |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
387 |
* drinks |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
388 |
tools |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
389 |
|
2825 | 390 |
The information displayed by ``hg stack`` adapts to the active topic: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
391 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
392 |
$ hg stack |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
393 |
### topic: drinks |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
394 |
### branch: default |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
395 |
t2@ Adding orange juice (current) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
396 |
t1: Adding apple juice |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2679
diff
changeset
|
397 |
t0^ adding fruits (base) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
398 |
|
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
399 |
$ hg update tools |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
400 |
switching to topic tools |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
401 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
402 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
403 |
$ hg stack |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
404 |
### topic: tools |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
405 |
### branch: default |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
406 |
t3@ Adding drill (current) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
407 |
t2: Adding saw |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
408 |
t1: Adding hammer |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2679
diff
changeset
|
409 |
t0^ adding fruits (base) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
410 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
411 |
They are seen as independent branches by Mercurial. No rebase or merge |
2825 | 412 |
between them will be attempted by default: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
413 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
414 |
$ hg rebase |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
415 |
nothing to rebase |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
416 |
[1] |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
417 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
418 |
Server activity: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
419 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
420 |
$ cd ../server |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
421 |
$ hg update |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
422 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
423 |
$ mv shopping foo |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
424 |
$ echo 'Coat' > shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
425 |
$ cat foo >> shopping |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
426 |
$ hg commit -m 'add a coat' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
427 |
$ echo 'Coat' > shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
428 |
$ echo 'Shoes' >> shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
429 |
$ cat foo >> shopping |
2720
db3830646e34
tutorial: use rm instead of 'hg rm' for an untracked temporary file
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2679
diff
changeset
|
430 |
$ rm foo |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
431 |
$ hg commit -m 'add a pair of shoes' |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
432 |
$ cd ../client |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
433 |
|
2825 | 434 |
Let's see what other people did in the meantime: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
435 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
436 |
$ hg pull |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
437 |
pulling from $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
438 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
439 |
adding changesets |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
440 |
adding manifests |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
441 |
adding file changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
442 |
added 2 changesets with 2 changes to 1 files (+1 heads) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
443 |
(run 'hg heads' to see heads) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
444 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
445 |
There are new changes! We can simply use ``hg rebase`` to update our |
2825 | 446 |
changeset on top of the latest: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
447 |
|
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
448 |
$ hg log -G |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
449 |
o changeset: 12:fbff9bc37a43 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
450 |
| tag: tip |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
451 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
452 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
453 |
| summary: add a pair of shoes |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
454 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
455 |
o changeset: 11:f2d6cacc6115 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
456 |
| parent: 5:2d50db8b5b4c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
457 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
458 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
459 |
| summary: add a coat |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
460 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
461 |
| o changeset: 10:70dfa201ed73 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
462 |
| | topic: drinks |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
463 |
| | user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
464 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
465 |
| | summary: Adding orange juice |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
466 |
| | |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
467 |
| o changeset: 9:8dfa45bd5e0c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
468 |
|/ topic: drinks |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
469 |
| parent: 5:2d50db8b5b4c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
470 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
471 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
472 |
| summary: Adding apple juice |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
473 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
474 |
| @ changeset: 8:34255b455dac |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
475 |
| | topic: tools |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
476 |
| | user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
477 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
478 |
| | summary: Adding drill |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
479 |
| | |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
480 |
| o changeset: 7:cffff85af537 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
481 |
| | topic: tools |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
482 |
| | user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
483 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
484 |
| | summary: Adding saw |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
485 |
| | |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
486 |
| o changeset: 6:183984ef46d1 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
487 |
|/ topic: tools |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
488 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
489 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
490 |
| summary: Adding hammer |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
491 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
492 |
o changeset: 5:2d50db8b5b4c |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
493 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
494 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
495 |
| summary: adding fruits |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
496 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
497 |
o changeset: 4:4011b46eeb33 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
498 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
499 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
500 |
| summary: adding condiments |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
501 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
502 |
o changeset: 3:6104862e8b84 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
503 |
| parent: 0:38da43f0a2ea |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
504 |
| user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
505 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
506 |
| summary: Adding clothes |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
507 |
| |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
508 |
o changeset: 0:38da43f0a2ea |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
509 |
user: test |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
510 |
date: Thu Jan 01 00:00:00 1970 +0000 |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
511 |
summary: Shopping list |
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
512 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
513 |
$ hg rebase |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
514 |
rebasing 6:183984ef46d1 "Adding hammer" |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
515 |
merging shopping |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
516 |
switching to topic tools |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
517 |
rebasing 7:cffff85af537 "Adding saw" |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
518 |
merging shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
519 |
rebasing 8:34255b455dac "Adding drill" |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
520 |
merging shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
521 |
|
2721
c3a29c7abbee
tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2720
diff
changeset
|
522 |
But what about the other topic? You can use 'hg topic --verbose' to see |
2825 | 523 |
information about all the topics: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
524 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
525 |
$ hg topic --verbose |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
526 |
drinks (on branch: default, 2 changesets, 2 behind) |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
527 |
* tools (on branch: default, 3 changesets) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
528 |
|
2886
00518926094f
topic: reword and simplify explanation of "behind"
Aurélien Campéas
parents:
2885
diff
changeset
|
529 |
The "2 behind" is telling you that there are 2 new changesets over the base of the topic. |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
530 |
|
2825 | 531 |
Pushing that topic would create a new head, and therefore will be prevented: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
532 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
533 |
$ hg push --rev drinks |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
534 |
pushing to $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
535 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
536 |
abort: push creates new remote head 70dfa201ed73! |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
537 |
(merge or see 'hg help push' for details about pushing new heads) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
538 |
[255] |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
539 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
540 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
541 |
Even after a rebase, pushing all active topics at the same time will complain |
2825 | 542 |
about the multiple heads it would create on that branch: |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
543 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
544 |
$ hg rebase -b drinks |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
545 |
rebasing 9:8dfa45bd5e0c "Adding apple juice" |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
546 |
merging shopping |
2679
5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2120
diff
changeset
|
547 |
switching to topic drinks |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
548 |
rebasing 10:70dfa201ed73 "Adding orange juice" |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
549 |
merging shopping |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
550 |
switching to topic tools |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
551 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
552 |
$ hg push |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
553 |
pushing to $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
554 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
555 |
abort: push creates new remote head 4cd7c1591a67! |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
556 |
(merge or see 'hg help push' for details about pushing new heads) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
557 |
[255] |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
558 |
|
2721
c3a29c7abbee
tutorial: word wrap long lines
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2720
diff
changeset
|
559 |
Publishing only one of them is allowed (as long as it does not create a new |
2825 | 560 |
branch head as we just saw in the previous case): |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
561 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
562 |
$ hg push -r drinks |
2120
e38156312410
tests: add glob for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
2045
diff
changeset
|
563 |
pushing to $TESTTMP/server (glob) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
564 |
searching for changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
565 |
adding changesets |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
566 |
adding manifests |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
567 |
adding file changes |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
568 |
added 2 changesets with 2 changes to 1 files |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
569 |
2 new obsolescence markers |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
570 |
|
2722
44a6e6fbf80b
tutorial: fix grammar and spelling
Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
parents:
2721
diff
changeset
|
571 |
The published topic has now disappeared, and the other is now marked as |
2825 | 572 |
"behind": |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
573 |
|
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
574 |
$ hg topic --verbose |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
575 |
* tools (on branch: default, 3 changesets, 2 behind) |
2827
498409c72dd2
doc: various improvements on topic tutorial
Boris Feld <boris.feld@octobus.net>
parents:
2826
diff
changeset
|
576 |
|
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
577 |
$ hg stack |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
578 |
### topic: tools |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
579 |
### branch: default, 2 behind |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
580 |
t3@ Adding drill (current) |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
581 |
t2: Adding saw |
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
582 |
t1: Adding hammer |
2712
f19b314d8475
topics: add t0 and b0 to the stack
Pulkit Goyal <7895pulkit@gmail.com>
parents:
2679
diff
changeset
|
583 |
t0^ add a pair of shoes (base) |
2014
cd6d32a0155c
tutorial: add a second part about having multiple topic
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2013
diff
changeset
|
584 |
|
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
585 |
Working Within Your Stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
586 |
=========================== |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
587 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
588 |
Navigating within your stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
589 |
---------------------------- |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
590 |
|
2885 | 591 |
As we saw before `stack` displays changesets on your current topic in a clean way: |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
592 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
593 |
$ hg topics --verbose |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
594 |
* tools (on branch: default, 3 changesets, 2 behind) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
595 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
596 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
597 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
598 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
599 |
t3@ Adding drill (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
600 |
t2: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
601 |
t1: Adding hammer |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
602 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
603 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
604 |
You can navigate in your current stack with `previous` and `next`. |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
605 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
606 |
`previous` will takes you to the parent of your working directory parent on the same topic. |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
607 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
608 |
$ hg previous |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
609 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
610 |
[14] Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
611 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
612 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
613 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
614 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
615 |
t3: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
616 |
t2@ Adding saw (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
617 |
t1: Adding hammer |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
618 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
619 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
620 |
`next` will moves take you to the children of your working directory parent on the same topic. |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
621 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
622 |
$ hg next |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
623 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
624 |
[15] Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
625 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
626 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
627 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
628 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
629 |
t3@ Adding drill (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
630 |
t2: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
631 |
t1: Adding hammer |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
632 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
633 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
634 |
You can also directly access changesets within your stack with the revset `t#`. |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
635 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
636 |
$ hg update t1 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
637 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
638 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
639 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
640 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
641 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
642 |
t3: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
643 |
t2: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
644 |
t1@ Adding hammer (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
645 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
646 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
647 |
Editing your work mid-stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
648 |
--------------------------- |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
649 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
650 |
It's easy to edit your work inside your stack: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
651 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
652 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
653 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
654 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
655 |
t3: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
656 |
t2: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
657 |
t1@ Adding hammer (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
658 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
659 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
660 |
$ hg amend -m "Adding hammer to the shopping list" |
2854
66796d7b5415
warning: rename unstable warning message
Boris Feld <boris.feld@octobus.net>
parents:
2834
diff
changeset
|
661 |
2 new orphan changesets |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
662 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
663 |
Understanding the current situation with hg log is not so easy: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
664 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
665 |
$ hg log -G -r "t0::" |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
666 |
@ changeset: 18:b7509bd417f8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
667 |
| tag: tip |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
668 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
669 |
| parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
670 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
671 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
672 |
| summary: Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
673 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
674 |
| o changeset: 17:4cd7c1591a67 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
675 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
676 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
677 |
| | summary: Adding orange juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
678 |
| | |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
679 |
| o changeset: 16:20759cb47ff8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
680 |
|/ parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
681 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
682 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
683 |
| summary: Adding apple juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
684 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
685 |
| o changeset: 15:bb1e6254f532 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
686 |
| | topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
687 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
688 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2833
diff
changeset
|
689 |
| | instability: orphan |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
690 |
| | summary: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
691 |
| | |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
692 |
| o changeset: 14:d4f97f32f8a1 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
693 |
| | topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
694 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
695 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
2834
38db1466c6fb
log: unstable was renamed into orphan
Boris Feld <boris.feld@octobus.net>
parents:
2833
diff
changeset
|
696 |
| | instability: orphan |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
697 |
| | summary: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
698 |
| | |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
699 |
| x changeset: 13:a8ab3599d53d |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
700 |
|/ topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
701 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
702 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
2896
462adae9fea7
obsfate: use effect flag information for computing a better verb
Boris Feld <boris.feld@octobus.net>
parents:
2886
diff
changeset
|
703 |
| obsolete: reworded as b7509bd417f8 |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
704 |
| summary: Adding hammer |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
705 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
706 |
o changeset: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
707 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
708 |
~ date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
709 |
summary: add a pair of shoes |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
710 |
|
2885 | 711 |
Fortunately stack shows you a better visualization: |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
712 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
713 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
714 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
715 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
716 |
t3$ Adding drill (unstable) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
717 |
t2$ Adding saw (unstable) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
718 |
t1@ Adding hammer to the shopping list (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
719 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
720 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
721 |
It's easy to stabilize the situation, `next` has an `--evolve` option: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
722 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
723 |
$ hg next --evolve |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
724 |
move:[14] Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
725 |
atop:[18] Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
726 |
working directory now at d5c51ee5762a |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
727 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
728 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
729 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
730 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
731 |
t3$ Adding drill (unstable) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
732 |
t2@ Adding saw (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
733 |
t1: Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
734 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
735 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
736 |
One more to go: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
737 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
738 |
$ hg next --evolve |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
739 |
move:[15] Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
740 |
atop:[19] Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
741 |
working directory now at bae3758e46bf |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
742 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
743 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
744 |
### topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
745 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
746 |
t3@ Adding drill (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
747 |
t2: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
748 |
t1: Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
749 |
t0^ add a pair of shoes (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
750 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
751 |
Let's take a look at `hg log` once again: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
752 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
753 |
$ hg log -G -r "t0::" |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
754 |
@ changeset: 20:bae3758e46bf |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
755 |
| tag: tip |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
756 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
757 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
758 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
759 |
| summary: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
760 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
761 |
o changeset: 19:d5c51ee5762a |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
762 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
763 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
764 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
765 |
| summary: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
766 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
767 |
o changeset: 18:b7509bd417f8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
768 |
| topic: tools |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
769 |
| parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
770 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
771 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
772 |
| summary: Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
773 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
774 |
| o changeset: 17:4cd7c1591a67 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
775 |
| | user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
776 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
777 |
| | summary: Adding orange juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
778 |
| | |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
779 |
| o changeset: 16:20759cb47ff8 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
780 |
|/ parent: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
781 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
782 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
783 |
| summary: Adding apple juice |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
784 |
| |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
785 |
o changeset: 12:fbff9bc37a43 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
786 |
| user: test |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
787 |
~ date: Thu Jan 01 00:00:00 1970 +0000 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
788 |
summary: add a pair of shoes |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
789 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
790 |
Multi-headed stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
791 |
------------------ |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
792 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
793 |
Stack is also very helpful when you have a multi-headed stack: |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
794 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
795 |
$ hg up t1 |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
796 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
797 |
|
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
798 |
$ echo "nails" > new_shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
799 |
$ cat shopping >> new_shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
800 |
$ mv new_shopping shopping |
2829
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
801 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
802 |
$ hg commit -m 'Adding nails' |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
803 |
|
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
804 |
$ hg stack |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
805 |
### topic: tools (2 heads) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
806 |
### branch: default, 2 behind |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
807 |
t4: Adding drill |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
808 |
t3: Adding saw |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
809 |
t1^ Adding hammer to the shopping list (base) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
810 |
t2@ Adding nails (current) |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
811 |
t1: Adding hammer to the shopping list |
1c529afd3fef
doc: add stack part in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2827
diff
changeset
|
812 |
t0^ add a pair of shoes (base) |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
813 |
|
2885 | 814 |
Solving this situation is easy with a topic: use merge or rebase. |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
815 |
Merge within a multi-headed stack will use the other topic head as |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
816 |
redestination if the topic has multiple heads. |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
817 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
818 |
$ hg log -G |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
819 |
@ changeset: 21:f936c6da9d61 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
820 |
| tag: tip |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
821 |
| topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
822 |
| parent: 18:b7509bd417f8 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
823 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
824 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
825 |
| summary: Adding nails |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
826 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
827 |
| o changeset: 20:bae3758e46bf |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
828 |
| | topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
829 |
| | user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
830 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
831 |
| | summary: Adding drill |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
832 |
| | |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
833 |
| o changeset: 19:d5c51ee5762a |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
834 |
|/ topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
835 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
836 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
837 |
| summary: Adding saw |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
838 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
839 |
o changeset: 18:b7509bd417f8 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
840 |
| topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
841 |
| parent: 12:fbff9bc37a43 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
842 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
843 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
844 |
| summary: Adding hammer to the shopping list |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
845 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
846 |
| o changeset: 17:4cd7c1591a67 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
847 |
| | user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
848 |
| | date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
849 |
| | summary: Adding orange juice |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
850 |
| | |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
851 |
| o changeset: 16:20759cb47ff8 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
852 |
|/ parent: 12:fbff9bc37a43 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
853 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
854 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
855 |
| summary: Adding apple juice |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
856 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
857 |
o changeset: 12:fbff9bc37a43 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
858 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
859 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
860 |
| summary: add a pair of shoes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
861 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
862 |
o changeset: 11:f2d6cacc6115 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
863 |
| parent: 5:2d50db8b5b4c |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
864 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
865 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
866 |
| summary: add a coat |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
867 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
868 |
o changeset: 5:2d50db8b5b4c |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
869 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
870 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
871 |
| summary: adding fruits |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
872 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
873 |
o changeset: 4:4011b46eeb33 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
874 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
875 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
876 |
| summary: adding condiments |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
877 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
878 |
o changeset: 3:6104862e8b84 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
879 |
| parent: 0:38da43f0a2ea |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
880 |
| user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
881 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
882 |
| summary: Adding clothes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
883 |
| |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
884 |
o changeset: 0:38da43f0a2ea |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
885 |
user: test |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
886 |
date: Thu Jan 01 00:00:00 1970 +0000 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
887 |
summary: Shopping list |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
888 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
889 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
890 |
$ hg up t4 |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
891 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
892 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
893 |
$ hg rebase |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
894 |
rebasing 19:d5c51ee5762a "Adding saw" |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
895 |
merging shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
896 |
rebasing 20:bae3758e46bf "Adding drill" |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
897 |
merging shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
898 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
899 |
$ hg commit -m "Merge tools" |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
900 |
nothing changed |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
901 |
[1] |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
902 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
903 |
$ hg stack |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
904 |
### topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
905 |
### branch: default, 2 behind |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
906 |
t4@ Adding drill (current) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
907 |
t3: Adding saw |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
908 |
t2: Adding nails |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
909 |
t1: Adding hammer to the shopping list |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
910 |
t0^ add a pair of shoes (base) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
911 |
|
2885 | 912 |
Collaborating through a non-publishing server |
913 |
========================--=================== |
|
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
914 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
915 |
.. setup: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
916 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
917 |
.. Let's create a non-publishing server: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
918 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
919 |
$ cd .. |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
920 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
921 |
$ hg clone server non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
922 |
updating to branch default |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
923 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
924 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
925 |
$ cd non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
926 |
$ cat >> .hg/hgrc << EOF |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
927 |
> [phases] |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
928 |
> publish = false |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
929 |
> EOF |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
930 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
931 |
.. And another client: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
932 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
933 |
$ cd .. |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
934 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
935 |
$ hg clone server other-client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
936 |
updating to branch default |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
937 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
938 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
939 |
$ cd client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
940 |
|
2885 | 941 |
We can now share these draft changesets: |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
942 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
943 |
$ hg push ../non-publishing-server -r tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
944 |
pushing to ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
945 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
946 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
947 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
948 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
949 |
added 4 changesets with 4 changes to 1 files (+1 heads) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
950 |
8 new obsolescence markers |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
951 |
|
2885 | 952 |
Pushing the new topic branch to a non publishing server did not require |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
953 |
--force. As long as new heads are on their own topic, Mercurial will not |
2885 | 954 |
complain about them. |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
955 |
|
2885 | 956 |
From another client, we will get them with their topic: |
2830
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
957 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
958 |
$ cd ../other-client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
959 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
960 |
$ hg pull ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
961 |
pulling from ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
962 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
963 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
964 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
965 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
966 |
added 4 changesets with 4 changes to 1 files (+1 heads) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
967 |
8 new obsolescence markers |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
968 |
(run 'hg heads' to see heads) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
969 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
970 |
$ hg topics --verbose |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
971 |
tools (on branch: default, 4 changesets, 2 behind) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
972 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
973 |
$ hg up tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
974 |
switching to topic tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
975 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
976 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
977 |
$ hg stack |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
978 |
### topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
979 |
### branch: default, 2 behind |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
980 |
t4@ Adding drill (current) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
981 |
t3: Adding saw |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
982 |
t2: Adding nails |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
983 |
t1: Adding hammer to the shopping list |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
984 |
t0^ add a pair of shoes (base) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
985 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
986 |
We can also add new changesets and share them: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
987 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
988 |
$ echo screws >> shopping |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
989 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
990 |
$ hg commit -A -m "Adding screws" |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
991 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
992 |
$ hg push ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
993 |
pushing to ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
994 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
995 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
996 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
997 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
998 |
added 1 changesets with 1 changes to 1 files |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
999 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1000 |
And retrieve them on the first client: |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1001 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1002 |
$ cd ../client |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1003 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1004 |
$ hg pull ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1005 |
pulling from ../non-publishing-server |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1006 |
searching for changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1007 |
adding changesets |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1008 |
adding manifests |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1009 |
adding file changes |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1010 |
added 1 changesets with 1 changes to 1 files |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1011 |
(run 'hg update' to get a working copy) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1012 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1013 |
$ hg update |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1014 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1015 |
|
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1016 |
$ hg stack |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1017 |
### topic: tools |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1018 |
### branch: default, 2 behind |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1019 |
t5@ Adding screws (current) |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1020 |
t4: Adding drill |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1021 |
t3: Adding saw |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1022 |
t2: Adding nails |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1023 |
t1: Adding hammer to the shopping list |
499b2dd69107
doc: add part about exchanging drafts in topic tutorial
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
2829
diff
changeset
|
1024 |
t0^ add a pair of shoes (base) |