Mercurial > hg
annotate tests/test-bookmarks.t @ 17295:1f08ecc7febb stable
pushkey: splits obsolete marker exchange into multiple keys
Obsolete markers are now exchanged in smaller pieces that fit in a http header.
This changes is done to avoid 400 bad request error when exchanging obsolete
puskey over http.
The last key pushed is always hold by the "dump0" key to ensure an easy place to
hook for people who need it.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Fri, 27 Jul 2012 18:32:56 +0200 |
parents | ec7b9bec19c9 |
children | 6e4b962600a3 4a07d2ff7c66 |
rev | line source |
---|---|
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 |
16822
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
87 $ hg log -r 'bookmark("re:X")' |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
88 changeset: 0:f7b1eb17ad24 |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
89 bookmark: X |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
90 user: test |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
91 date: Thu Jan 01 00:00:00 1970 +0000 |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
92 summary: 0 |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
93 |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
94 changeset: 1:925d80f479bb |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
95 bookmark: X2 |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
96 tag: tip |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
97 user: test |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
98 date: Thu Jan 01 00:00:00 1970 +0000 |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
99 summary: 1 |
da55d8a77390
revset: add pattern matching to 'bookmarks' revset expression
Simon King <simon@simonking.org.uk>
parents:
16573
diff
changeset
|
100 |
13925
c315ffc13a25
tests: add tests for non-existant branch/tag/bookmark
Idan Kamara <idankk86@gmail.com>
parents:
13911
diff
changeset
|
101 $ hg log -r 'bookmark(unknown)' |
c315ffc13a25
tests: add tests for non-existant branch/tag/bookmark
Idan Kamara <idankk86@gmail.com>
parents:
13911
diff
changeset
|
102 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
|
103 [255] |
c315ffc13a25
tests: add tests for non-existant branch/tag/bookmark
Idan Kamara <idankk86@gmail.com>
parents:
13911
diff
changeset
|
104 |
12822
f13acb96b2a7
Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents:
12714
diff
changeset
|
105 $ hg help revsets | grep 'bookmark(' |
f13acb96b2a7
Fix and unify transplant and bookmarks revsets doc registration
Patrick Mezard <pmezard@gmail.com>
parents:
12714
diff
changeset
|
106 "bookmark([name])" |
12714
f5178fbcd197
bookmarks: add revset for referencing bookmarks
Augie Fackler <durin42@gmail.com>
parents:
12346
diff
changeset
|
107 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
108 bookmarks X and X2 moved to rev 1, Y at rev -1 |
7261 | 109 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
110 $ 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
|
111 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
|
112 * X2 1:925d80f479bb |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
113 Y -1:000000000000 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
114 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
115 bookmark rev 0 again |
7261 | 116 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
117 $ hg bookmark -r 0 Z |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
118 |
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
119 $ 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
|
120 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
|
121 $ echo c > c |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
122 $ hg add c |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
123 $ 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
|
124 created new head |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
125 |
13416
5431b3f3e52e
bookmarks: make track.current=True default behaviour and remove option (BC)
David Soria Parra <dsp@php.net>
parents:
13388
diff
changeset
|
126 bookmarks X moved to rev 2, Y at rev -1, Z at rev 0 |
7261 | 127 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
128 $ 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
|
129 * 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
|
130 X2 1:925d80f479bb |
13388
a184dbd9b2c5
localrepo: sort hg bookmark output
David Soria Parra <dsp@php.net>
parents:
13386
diff
changeset
|
131 Y -1:000000000000 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
132 Z 0:f7b1eb17ad24 |
7261 | 133 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
134 rename nonexistent bookmark |
7261 | 135 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
136 $ 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
|
137 abort: bookmark 'A' does not exist |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
138 [255] |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
139 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
140 rename to existent bookmark |
7261 | 141 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
142 $ 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
|
143 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
|
144 [255] |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
145 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
146 force rename to existent bookmark |
7261 | 147 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
148 $ hg bookmark -f -m X Y |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
149 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
150 list bookmarks |
7261 | 151 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
152 $ 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
|
153 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
|
154 * Y 2:db815d6d32e6 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
155 Z 0:f7b1eb17ad24 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
156 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
157 rename without new name |
7261 | 158 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
159 $ hg bookmark -m Y |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
160 abort: new bookmark name required |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
161 [255] |
11861
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 delete without name |
7261 | 164 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
165 $ hg bookmark -d |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
166 abort: bookmark name required |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
167 [255] |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
168 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
169 delete nonexistent bookmark |
7261 | 170 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
171 $ 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
|
172 abort: bookmark 'A' does not exist |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
173 [255] |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
174 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
175 bookmark name with spaces should be stripped |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
176 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
177 $ hg bookmark ' x y ' |
7261 | 178 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
179 list bookmarks |
7261 | 180 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
181 $ 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
|
182 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
|
183 Y 2:db815d6d32e6 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
184 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
|
185 * x y 2:db815d6d32e6 |
7261 | 186 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
187 look up stripped bookmark name |
7261 | 188 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
189 $ 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
|
190 changeset: 2:db815d6d32e6 |
13386
f78bc5ddbe4f
templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents:
13385
diff
changeset
|
191 bookmark: Y |
f78bc5ddbe4f
templater: add bookmarks to templates and default output
David Soria Parra <dsp@php.net>
parents:
13385
diff
changeset
|
192 bookmark: x y |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
193 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
|
194 parent: 0:f7b1eb17ad24 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
195 user: test |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
196 date: Thu Jan 01 00:00:00 1970 +0000 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
197 summary: 2 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
198 |
7261 | 199 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
200 reject bookmark name with newline |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
201 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
202 $ hg bookmark ' |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
203 > ' |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
204 abort: bookmark name cannot contain newlines |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
205 [255] |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
206 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
207 bookmark with existing name |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
208 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
209 $ 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
|
210 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
|
211 [255] |
7261 | 212 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
213 force bookmark with existing name |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
214 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
215 $ hg bookmark -f Z |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
216 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
217 list bookmarks |
7261 | 218 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
219 $ 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
|
220 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
|
221 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
|
222 * 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
|
223 x y 2:db815d6d32e6 |
7261 | 224 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
225 revision but no bookmark name |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
226 |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
227 $ hg bookmark -r . |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
228 abort: bookmark name required |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
11861
diff
changeset
|
229 [255] |
7261 | 230 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
231 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
|
232 |
11861
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
233 $ hg bookmark ' ' |
41d481ddd976
tests: unify test-bookmarks
Martin Geisler <mg@lazybytes.net>
parents:
11704
diff
changeset
|
234 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
|
235 [255] |
13425
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
236 |
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
237 invalid bookmark |
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
238 |
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
239 $ hg bookmark 'foo:bar' |
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
240 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
|
241 [255] |
0fe36c347c00
bookmarks: forbid \0 \r \n : in bookmark names (BC)
David Soria Parra <dsp@php.net>
parents:
13416
diff
changeset
|
242 |
13474
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
243 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
|
244 |
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
245 $ echo "[extensions]" >> $HGRCPATH |
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
246 $ echo "bookmarks=" >> $HGRCPATH |
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
247 $ hg bookmarks |
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
248 X2 1:925d80f479bb |
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
249 Y 2:db815d6d32e6 |
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
250 * Z 2:db815d6d32e6 |
6c2e476b7a11
tests: check if the bookmarks extension is ignored
David Soria Parra <dsp@php.net>
parents:
13469
diff
changeset
|
251 x y 2:db815d6d32e6 |
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
252 |
13454
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
253 test summary |
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
254 |
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
255 $ hg summary |
14906
7c3c8f37e84f
summary: show bookmarks separate from tags and note active mark (issue2892)
Augie Fackler <durin42@gmail.com>
parents:
14846
diff
changeset
|
256 parent: 2:db815d6d32e6 tip |
13454
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
257 2 |
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
258 branch: default |
14906
7c3c8f37e84f
summary: show bookmarks separate from tags and note active mark (issue2892)
Augie Fackler <durin42@gmail.com>
parents:
14846
diff
changeset
|
259 bookmarks: *Z Y x y |
13454
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
260 commit: (clean) |
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
261 update: 1 new changesets, 2 branch heads (merge) |
afc84a879ac8
summary: add bookmarks to summary
David Soria Parra <dsp@php.net>
parents:
13448
diff
changeset
|
262 |
13477
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
263 test id |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
264 |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
265 $ hg id |
0fb2ff949790
id: add bookmarks to id
Kevin Bullock <kbullock@ringworld.org>
parents:
13474
diff
changeset
|
266 db815d6d32e6 tip Y/Z/x y |
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
267 |
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
268 test rollback |
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
269 |
14268 | 270 $ echo foo > f1 |
271 $ hg ci -Amr | |
272 adding f1 | |
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
273 $ hg bookmark -f Y -r 1 |
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
274 $ hg bookmark -f Z -r 1 |
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
275 $ hg rollback |
14268 | 276 repository tip rolled back to revision 2 (undo commit) |
277 working directory now based on revision 2 | |
278 $ hg bookmarks | |
279 X2 1:925d80f479bb | |
280 Y 2:db815d6d32e6 | |
281 * Z 2:db815d6d32e6 | |
282 x y 2:db815d6d32e6 | |
283 | |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
284 test clone |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
285 |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
286 $ hg bookmark -r 2 -i @ |
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
287 $ hg bookmark -r 2 -i a@ |
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
288 $ hg bookmarks |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
289 @ 2:db815d6d32e6 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
290 X2 1:925d80f479bb |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
291 Y 2:db815d6d32e6 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
292 * Z 2:db815d6d32e6 |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
293 a@ 2:db815d6d32e6 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
294 x y 2:db815d6d32e6 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
295 $ hg clone . cloned-bookmarks |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
296 updating to branch default |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
297 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
|
298 $ hg -R cloned-bookmarks bookmarks |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
299 @ 2:db815d6d32e6 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
300 X2 1:925d80f479bb |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
301 Y 2:db815d6d32e6 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
302 Z 2:db815d6d32e6 |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
303 a@ 2:db815d6d32e6 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
304 x y 2:db815d6d32e6 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
305 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
306 test clone with pull protocol |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
307 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
308 $ hg clone --pull . cloned-bookmarks-pull |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
309 requesting all changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
310 adding changesets |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
311 adding manifests |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
312 adding file changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
313 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
|
314 updating to branch default |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
315 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
|
316 $ hg -R cloned-bookmarks-pull bookmarks |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
317 @ 2:db815d6d32e6 |
14266
89e7d35e0ef0
fix bookmarks rollback behavior
Alexander Solovyov <alexander@solovyov.net>
parents:
13477
diff
changeset
|
318 X2 1:925d80f479bb |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
319 Y 2:db815d6d32e6 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
320 Z 2:db815d6d32e6 |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
321 a@ 2:db815d6d32e6 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
322 x y 2:db815d6d32e6 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
323 |
16276
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
324 $ hg bookmark -d @ |
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
325 $ hg bookmark -d a@ |
6b16ded5c810
bookmarks: clone non-divergent bookmarks with @ in them
Kevin Bullock <kbullock@ringworld.org>
parents:
15615
diff
changeset
|
326 |
13604
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
327 test clone with a specific revision |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
328 |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
329 $ hg clone -r 925d80 . cloned-bookmarks-rev |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
330 adding changesets |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
331 adding manifests |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
332 adding file changes |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
333 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
|
334 updating to branch default |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
335 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
|
336 $ hg -R cloned-bookmarks-rev bookmarks |
3f6a4579f803
hg: add support for cloning bookmarks
David Soria Parra <dsp@php.net>
parents:
13477
diff
changeset
|
337 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
|
338 |
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
339 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
|
340 |
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
341 $ 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
|
342 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
|
343 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
|
344 $ 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
|
345 $ 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
|
346 $ 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
|
347 $ 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
|
348 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
|
349 $ 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
|
350 $ 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
|
351 marked working directory as branch test |
15615 | 352 (branches are permanent and global, did you want a bookmark?) |
13663
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
353 $ 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
|
354 $ 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
|
355 $ 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
|
356 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
|
357 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
|
358 $ 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
|
359 adding changesets |
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
360 adding manifests |
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
361 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
|
362 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
|
363 (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
|
364 $ hg update |
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
365 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
|
366 $ hg bookmarks |
d16c99f16f00
bundle: update current bookmark to most recent revision on current branch
David Soria Parra <dsp@php.net>
parents:
13604
diff
changeset
|
367 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
|
368 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
|
369 * 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
|
370 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
|
371 |
14845
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
372 test wrongly formated bookmark |
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
373 |
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
374 $ echo '' >> .hg/bookmarks |
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
375 $ hg bookmarks |
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
376 X2 1:925d80f479bb |
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
377 Y 2:db815d6d32e6 |
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
378 * Z 3:125c9a1d6df6 |
677339529a53
bookmarks: more robust parsing of bookmarks file
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14268
diff
changeset
|
379 x y 2:db815d6d32e6 |
14846
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
380 $ echo "Ican'thasformatedlines" >> .hg/bookmarks |
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
381 $ hg bookmarks |
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
382 malformed line in .hg/bookmarks: "Ican'thasformatedlines" |
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
383 X2 1:925d80f479bb |
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
384 Y 2:db815d6d32e6 |
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
385 * Z 3:125c9a1d6df6 |
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
386 x y 2:db815d6d32e6 |
5097d8b5078c
bookmarks: add a warning for non empty malformed line
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
14845
diff
changeset
|
387 |
16573
5983de86462c
bookmarks: catch the proper exception for missing revisions
Matt Mackall <mpm@selenic.com>
parents:
16276
diff
changeset
|
388 test missing revisions |
5983de86462c
bookmarks: catch the proper exception for missing revisions
Matt Mackall <mpm@selenic.com>
parents:
16276
diff
changeset
|
389 |
5983de86462c
bookmarks: catch the proper exception for missing revisions
Matt Mackall <mpm@selenic.com>
parents:
16276
diff
changeset
|
390 $ echo "925d80f479bc z" > .hg/bookmarks |
5983de86462c
bookmarks: catch the proper exception for missing revisions
Matt Mackall <mpm@selenic.com>
parents:
16276
diff
changeset
|
391 $ hg book |
5983de86462c
bookmarks: catch the proper exception for missing revisions
Matt Mackall <mpm@selenic.com>
parents:
16276
diff
changeset
|
392 no bookmarks set |
17264
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
393 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
394 test stripping a non-checked-out but bookmarked revision |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
395 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
396 $ hg --config extensions.graphlog= log --graph |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
397 o changeset: 4:9ba5f110a0b3 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
398 | branch: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
399 | tag: tip |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
400 | parent: 2:db815d6d32e6 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
401 | user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
402 | date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
403 | summary: y |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
404 | |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
405 | @ changeset: 3:125c9a1d6df6 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
406 |/ user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
407 | date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
408 | summary: x |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
409 | |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
410 o changeset: 2:db815d6d32e6 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
411 | parent: 0:f7b1eb17ad24 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
412 | user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
413 | date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
414 | summary: 2 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
415 | |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
416 | o changeset: 1:925d80f479bb |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
417 |/ user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
418 | date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
419 | summary: 1 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
420 | |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
421 o changeset: 0:f7b1eb17ad24 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
422 user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
423 date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
424 summary: 0 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
425 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
426 $ hg book should-end-on-two |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
427 $ hg co --clean 4 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
428 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
429 $ hg book four |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
430 $ hg --config extensions.mq= strip 3 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
431 saved backup bundle to * (glob) |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
432 should-end-on-two should end up pointing to revision 2, as that's the |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
433 tipmost surviving ancestor of the stripped revision. |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
434 $ hg --config extensions.graphlog= log --graph |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
435 @ changeset: 3:9ba5f110a0b3 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
436 | branch: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
437 | bookmark: four |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
438 | tag: tip |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
439 | user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
440 | date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
441 | summary: y |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
442 | |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
443 o changeset: 2:db815d6d32e6 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
444 | bookmark: should-end-on-two |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
445 | parent: 0:f7b1eb17ad24 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
446 | user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
447 | date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
448 | summary: 2 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
449 | |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
450 | o changeset: 1:925d80f479bb |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
451 |/ user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
452 | date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
453 | summary: 1 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
454 | |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
455 o changeset: 0:f7b1eb17ad24 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
456 user: test |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
457 date: Thu Jan 01 00:00:00 1970 +0000 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
458 summary: 0 |
ec7b9bec19c9
strip: move bookmarks to nearest ancestor rather than '.'
Augie Fackler <raf@durin42.com>
parents:
16822
diff
changeset
|
459 |