| author | Patrick Mezard <pmezard@gmail.com> |
| Mon, 01 Aug 2011 23:58:50 +0200 | |
| branch | stable |
| changeset 15005 | 4a43e23b8c55 |
| parent 14268 | a55a0045704c |
| child 14845 | 677339529a53 |
| permissions | -rw-r--r-- |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
1 |
$ hg init |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
2 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
3 |
no bookmarks |
| 7261 | 4 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
5 |
$ hg bookmarks |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
6 |
no bookmarks set |
| 7261 | 7 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
8 |
bookmark rev -1 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
9 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
10 |
$ hg bookmark X |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
11 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
12 |
list bookmarks |
| 7261 | 13 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
14 |
$ hg bookmarks |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
15 |
* X -1:000000000000 |
| 7261 | 16 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
17 |
list bookmarks with color |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
18 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
19 |
$ hg --config extensions.color= --config color.mode=ansi \ |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
20 |
> bookmarks --color=always |
|
12942
05fffd665170
tests: use (esc) for all non-ASCII test output
Mads Kiilerich <mads@kiilerich.com>
parents:
12822
diff
changeset
|
21 |
\x1b[0;32m * X -1:000000000000\x1b[0m (esc) |
| 7261 | 22 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
23 |
$ echo a > a |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
24 |
$ hg add a |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
25 |
$ hg commit -m 0 |
|
10826
717c35d55fb3
color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents:
7261
diff
changeset
|
26 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
27 |
bookmark X moved to rev 0 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
28 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
29 |
$ hg bookmarks |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
30 |
* X 0:f7b1eb17ad24 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
31 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
32 |
look up bookmark |
| 7261 | 33 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
34 |
$ hg log -r X |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
35 |
changeset: 0:f7b1eb17ad24 |
|
13386
f78bc5ddbe4f
templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents:
13385
diff
changeset
|
36 |
bookmark: X |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
37 |
tag: tip |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
38 |
user: test |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
39 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
40 |
summary: 0 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
41 |
|
| 7261 | 42 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
43 |
second bookmark for rev 0 |
| 7261 | 44 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
45 |
$ hg bookmark X2 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
46 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
47 |
bookmark rev -1 again |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
48 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
49 |
$ hg bookmark -r null Y |
| 7261 | 50 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
51 |
list bookmarks |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
52 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
53 |
$ hg bookmarks |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
54 |
X 0:f7b1eb17ad24 |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
55 |
* X2 0:f7b1eb17ad24 |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
56 |
Y -1:000000000000 |
| 7261 | 57 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
58 |
$ echo b > b |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
59 |
$ hg add b |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
60 |
$ hg commit -m 1 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
61 |
|
|
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
62 |
bookmarks revset |
|
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
63 |
|
|
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
64 |
$ hg log -r 'bookmark()' |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
65 |
changeset: 0:f7b1eb17ad24 |
|
13386
f78bc5ddbe4f
templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents:
13385
diff
changeset
|
66 |
bookmark: X |
|
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
67 |
user: test |
|
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
68 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
69 |
summary: 0 |
|
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
70 |
|
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
71 |
changeset: 1:925d80f479bb |
|
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
72 |
bookmark: X2 |
|
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
73 |
tag: tip |
|
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
74 |
user: test |
|
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
75 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
76 |
summary: 1 |
|
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
77 |
|
|
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
78 |
$ hg log -r 'bookmark(Y)' |
|
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
79 |
$ hg log -r 'bookmark(X2)' |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
80 |
changeset: 1:925d80f479bb |
|
13386
f78bc5ddbe4f
templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents:
13385
diff
changeset
|
81 |
bookmark: X2 |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
82 |
tag: tip |
|
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
83 |
user: test |
|
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
84 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
85 |
summary: 1 |
|
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
86 |
|
|
13925
c315ffc13a25
tests: add tests for non-existant branch/tag/bookmark
Idan Kamara <idankk86@gmail.com>
parents:
13911
diff
changeset
|
87 |
$ hg log -r 'bookmark(unknown)' |
|
c315ffc13a25
tests: add tests for non-existant branch/tag/bookmark
Idan Kamara <idankk86@gmail.com>
parents:
13911
diff
changeset
|
88 |
abort: bookmark 'unknown' does not exist |
|
c315ffc13a25
tests: add tests for non-existant branch/tag/bookmark
Idan Kamara <idankk86@gmail.com>
parents:
13911
diff
changeset
|
89 |
[255] |
|
c315ffc13a25
tests: add tests for non-existant branch/tag/bookmark
Idan Kamara <idankk86@gmail.com>
parents:
13911
diff
changeset
|
90 |
|
|
12822
f13acb96b2a7
Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents:
12714
diff
changeset
|
91 |
$ hg help revsets | grep 'bookmark(' |
|
f13acb96b2a7
Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents:
12714
diff
changeset
|
92 |
"bookmark([name])" |
|
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
93 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
94 |
bookmarks X and X2 moved to rev 1, Y at rev -1 |
| 7261 | 95 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
96 |
$ hg bookmarks |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
97 |
X 0:f7b1eb17ad24 |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
98 |
* X2 1:925d80f479bb |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
99 |
Y -1:000000000000 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
100 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
101 |
bookmark rev 0 again |
| 7261 | 102 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
103 |
$ hg bookmark -r 0 Z |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
104 |
|
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
105 |
$ hg update X |
|
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
106 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
107 |
$ echo c > c |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
108 |
$ hg add c |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
109 |
$ hg commit -m 2 |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
110 |
created new head |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
111 |
|
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
112 |
bookmarks X moved to rev 2, Y at rev -1, Z at rev 0 |
| 7261 | 113 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
114 |
$ hg bookmarks |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
115 |
* X 2:db815d6d32e6 |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
116 |
X2 1:925d80f479bb |
|
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13386
diff
changeset
|
117 |
Y -1:000000000000 |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
118 |
Z 0:f7b1eb17ad24 |
| 7261 | 119 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
120 |
rename nonexistent bookmark |
| 7261 | 121 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
122 |
$ hg bookmark -m A B |
|
13911
6bc340940c18
bookmarks: change error messages to match those given by 'hg tag' commands
Idan Kamara <idankk86@gmail.com>
parents:
13663
diff
changeset
|
123 |
abort: bookmark 'A' does not exist |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
124 |
[255] |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
125 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
126 |
rename to existent bookmark |
| 7261 | 127 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
128 |
$ hg bookmark -m X Y |
|
13911
6bc340940c18
bookmarks: change error messages to match those given by 'hg tag' commands
Idan Kamara <idankk86@gmail.com>
parents:
13663
diff
changeset
|
129 |
abort: bookmark 'Y' already exists (use -f to force) |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
130 |
[255] |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
131 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
132 |
force rename to existent bookmark |
| 7261 | 133 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
134 |
$ hg bookmark -f -m X Y |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
135 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
136 |
list bookmarks |
| 7261 | 137 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
138 |
$ hg bookmark |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
139 |
X2 1:925d80f479bb |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
140 |
* Y 2:db815d6d32e6 |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
141 |
Z 0:f7b1eb17ad24 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
142 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
143 |
rename without new name |
| 7261 | 144 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
145 |
$ hg bookmark -m Y |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
146 |
abort: new bookmark name required |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
147 |
[255] |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
148 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
149 |
delete without name |
| 7261 | 150 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
151 |
$ hg bookmark -d |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
152 |
abort: bookmark name required |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
153 |
[255] |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
154 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
155 |
delete nonexistent bookmark |
| 7261 | 156 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
157 |
$ hg bookmark -d A |
|
13911
6bc340940c18
bookmarks: change error messages to match those given by 'hg tag' commands
Idan Kamara <idankk86@gmail.com>
parents:
13663
diff
changeset
|
158 |
abort: bookmark 'A' does not exist |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
159 |
[255] |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
160 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
161 |
bookmark name with spaces should be stripped |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
162 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
163 |
$ hg bookmark ' x y ' |
| 7261 | 164 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
165 |
list bookmarks |
| 7261 | 166 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
167 |
$ hg bookmarks |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
168 |
X2 1:925d80f479bb |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
169 |
Y 2:db815d6d32e6 |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
170 |
Z 0:f7b1eb17ad24 |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
171 |
* x y 2:db815d6d32e6 |
| 7261 | 172 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
173 |
look up stripped bookmark name |
| 7261 | 174 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
175 |
$ hg log -r '"x y"' |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
176 |
changeset: 2:db815d6d32e6 |
|
13386
f78bc5ddbe4f
templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents:
13385
diff
changeset
|
177 |
bookmark: Y |
|
f78bc5ddbe4f
templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents:
13385
diff
changeset
|
178 |
bookmark: x y |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
179 |
tag: tip |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
180 |
parent: 0:f7b1eb17ad24 |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
181 |
user: test |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
182 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
183 |
summary: 2 |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
184 |
|
| 7261 | 185 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
186 |
reject bookmark name with newline |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
187 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
188 |
$ hg bookmark ' |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
189 |
> ' |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
190 |
abort: bookmark name cannot contain newlines |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
191 |
[255] |
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
192 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
193 |
bookmark with existing name |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
194 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
195 |
$ hg bookmark Z |
|
13911
6bc340940c18
bookmarks: change error messages to match those given by 'hg tag' commands
Idan Kamara <idankk86@gmail.com>
parents:
13663
diff
changeset
|
196 |
abort: bookmark 'Z' already exists (use -f to force) |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
197 |
[255] |
| 7261 | 198 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
199 |
force bookmark with existing name |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
200 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
201 |
$ hg bookmark -f Z |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
202 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
203 |
list bookmarks |
| 7261 | 204 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
205 |
$ hg bookmark |
|
13448
97b69883e929
bookmarks: mark new bookmark as current if it points to the current dirstate
David Soria Parra <dsp@php.net>
parents:
13425
diff
changeset
|
206 |
X2 1:925d80f479bb |
|
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
207 |
Y 2:db815d6d32e6 |
|
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
208 |
* Z 2:db815d6d32e6 |
|
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
209 |
x y 2:db815d6d32e6 |
| 7261 | 210 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
211 |
revision but no bookmark name |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
212 |
|
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
213 |
$ hg bookmark -r . |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
214 |
abort: bookmark name required |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
215 |
[255] |
| 7261 | 216 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
217 |
bookmark name with whitespace only |
|
11704
18c47562d331
bookmarks: don't allow name to contain whitespaces only
Idan Kamara <idankk86@gmail.com>
parents:
11282
diff
changeset
|
218 |
|
|
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
219 |
$ hg bookmark ' ' |
|
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
220 |
abort: bookmark names cannot consist entirely of whitespace |
|
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
221 |
[255] |
|
13425
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
222 |
|
|
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
223 |
invalid bookmark |
|
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
224 |
|
|
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
225 |
$ hg bookmark 'foo:bar' |
|
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
226 |
abort: bookmark 'foo:bar' contains illegal character |
|
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
227 |
[255] |
|
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
228 |
|
|
13474
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
229 |
the bookmark extension should be ignored now that it is part of core |
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
230 |
|
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
231 |
$ echo "[extensions]" >> $HGRCPATH |
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
232 |
$ echo "bookmarks=" >> $HGRCPATH |
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
233 |
$ hg bookmarks |
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
234 |
X2 1:925d80f479bb |
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
235 |
Y 2:db815d6d32e6 |
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
236 |
* Z 2:db815d6d32e6 |
|
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
237 |
x y 2:db815d6d32e6 |
|
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
238 |
|
|
13454
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
239 |
test summary |
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
240 |
|
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
241 |
$ hg summary |
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
242 |
parent: 2:db815d6d32e6 tip Y Z x y |
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
243 |
2 |
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
244 |
branch: default |
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
245 |
commit: (clean) |
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
246 |
update: 1 new changesets, 2 branch heads (merge) |
|
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
247 |
|
|
13477
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
248 |
test id |
|
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
249 |
|
|
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
250 |
$ hg id |
|
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
251 |
db815d6d32e6 tip Y/Z/x y |
|
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
252 |
|
|
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
253 |
test rollback |
|
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
254 |
|
| 14268 | 255 |
$ echo foo > f1 |
256 |
$ hg ci -Amr |
|
257 |
adding f1 |
|
|
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
258 |
$ hg bookmark -f Y -r 1 |
|
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
259 |
$ hg bookmark -f Z -r 1 |
|
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
260 |
$ hg rollback |
| 14268 | 261 |
repository tip rolled back to revision 2 (undo commit) |
262 |
working directory now based on revision 2 |
|
263 |
$ hg bookmarks |
|
264 |
X2 1:925d80f479bb |
|
265 |
Y 2:db815d6d32e6 |
|
266 |
* Z 2:db815d6d32e6 |
|
267 |
x y 2:db815d6d32e6 |
|
268 |
||
|
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
269 |
test clone |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
270 |
|
|
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
271 |
$ hg bookmarks |
|
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
272 |
X2 1:925d80f479bb |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
273 |
Y 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
274 |
* Z 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
275 |
x y 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
276 |
$ hg clone . cloned-bookmarks |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
277 |
updating to branch default |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
278 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
279 |
$ hg -R cloned-bookmarks bookmarks |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
280 |
X2 1:925d80f479bb |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
281 |
Y 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
282 |
Z 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
283 |
x y 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
284 |
|
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
285 |
test clone with pull protocol |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
286 |
|
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
287 |
$ hg clone --pull . cloned-bookmarks-pull |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
288 |
requesting all changes |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
289 |
adding changesets |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
290 |
adding manifests |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
291 |
adding file changes |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
292 |
added 3 changesets with 3 changes to 3 files (+1 heads) |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
293 |
updating to branch default |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
294 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
295 |
$ hg -R cloned-bookmarks-pull bookmarks |
|
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
296 |
X2 1:925d80f479bb |
|
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
297 |
Y 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
298 |
Z 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
299 |
x y 2:db815d6d32e6 |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
300 |
|
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
301 |
test clone with a specific revision |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
302 |
|
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
303 |
$ hg clone -r 925d80 . cloned-bookmarks-rev |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
304 |
adding changesets |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
305 |
adding manifests |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
306 |
adding file changes |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
307 |
added 2 changesets with 2 changes to 2 files |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
308 |
updating to branch default |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
309 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
310 |
$ hg -R cloned-bookmarks-rev bookmarks |
|
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
311 |
X2 1:925d80f479bb |
|
13663
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
312 |
|
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
313 |
create bundle with two heads |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
314 |
|
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
315 |
$ hg clone . tobundle |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
316 |
updating to branch default |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
317 |
2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
318 |
$ echo x > tobundle/x |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
319 |
$ hg -R tobundle add tobundle/x |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
320 |
$ hg -R tobundle commit -m'x' |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
321 |
$ hg -R tobundle update -r -2 |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
322 |
0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
323 |
$ echo y > tobundle/y |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
324 |
$ hg -R tobundle branch test |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
325 |
marked working directory as branch test |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
326 |
$ hg -R tobundle add tobundle/y |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
327 |
$ hg -R tobundle commit -m'y' |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
328 |
$ hg -R tobundle bundle tobundle.hg |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
329 |
searching for changes |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
330 |
2 changesets found |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
331 |
$ hg unbundle tobundle.hg |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
332 |
adding changesets |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
333 |
adding manifests |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
334 |
adding file changes |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
335 |
added 2 changesets with 2 changes to 2 files (+1 heads) |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
336 |
(run 'hg heads' to see heads, 'hg merge' to merge) |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
337 |
$ hg update |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
338 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
339 |
$ hg bookmarks |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
340 |
X2 1:925d80f479bb |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
341 |
Y 2:db815d6d32e6 |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
342 |
* Z 3:125c9a1d6df6 |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
343 |
x y 2:db815d6d32e6 |
|
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
344 |