comparison tests/test-topic-change.t @ 4359:2cbb9914d227 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 22 Jan 2019 12:54:43 -0500
parents d5a2cc19903f
children a2fdbece7ce1 c2fab88e6d60
comparison
equal deleted inserted replaced
4312:108b08a16260 4359:2cbb9914d227
49 49
50 50
51 Clearing topic from revision without topic 51 Clearing topic from revision without topic
52 52
53 $ hg topic -r . --clear 53 $ hg topic -r . --clear
54 changed topic on 0 changes 54 cleared topic on 0 changesets
55 55
56 Clearing current topic when no active topic is not error 56 Clearing current topic when no active topic is not error
57 57
58 $ hg topic 58 $ hg topic
59 $ hg topic --clear 59 $ hg topic --clear
60 60
61 Setting topics to all the revisions 61 Setting topics to all the revisions
62 62
63 $ hg topic -r 0:: foo 63 $ hg topic -r 0:: foo
64 switching to topic foo 64 switching to topic foo
65 changed topic on 8 changes 65 changed topic on 8 changesets to "foo"
66 $ hg glog 66 $ hg glog
67 @ 15:05095f607171 {foo} 67 @ 15:05095f607171 {foo}
68 | Added h () 68 | Added h ()
69 | 69 |
70 o 14:97505b53ab0d {foo} 70 o 14:97505b53ab0d {foo}
98 foo (8 changesets) 98 foo (8 changesets)
99 Changing topics on some revisions (also testing issue 5441) 99 Changing topics on some revisions (also testing issue 5441)
100 100
101 $ hg topic -r abcedffeae90:: bar 101 $ hg topic -r abcedffeae90:: bar
102 switching to topic bar 102 switching to topic bar
103 changed topic on 4 changes 103 changed topic on 4 changesets to "bar"
104 $ hg glog 104 $ hg glog
105 @ 19:d7d36e193ea7 {bar} 105 @ 19:d7d36e193ea7 {bar}
106 | Added h () 106 | Added h ()
107 | 107 |
108 o 18:e7b418d79a05 {bar} 108 o 18:e7b418d79a05 {bar}
137 137
138 $ hg topic foobar 138 $ hg topic foobar
139 $ hg topic -r . --current 139 $ hg topic -r . --current
140 active topic 'foobar' grew its first changeset 140 active topic 'foobar' grew its first changeset
141 (see 'hg help topics' for more information) 141 (see 'hg help topics' for more information)
142 changed topic on 1 changes 142 changed topic on 1 changesets to "foobar"
143 $ hg glog -r . 143 $ hg glog -r .
144 @ 20:c2d6b7df5dcf {foobar} 144 @ 20:c2d6b7df5dcf {foobar}
145 | Added h () 145 | Added h ()
146 | 146 |
147 147
148 Changing topic in between the stack 148 Changing topic in between the stack
149 149
150 $ hg topic -r 9::10 --current 150 $ hg topic -r 9::10 --current
151 5 new orphan changesets 151 5 new orphan changesets
152 changed topic on 2 changes 152 changed topic on 2 changesets to "foobar"
153 $ hg glog 153 $ hg glog
154 o 22:1b88140feefe {foobar} 154 o 22:1b88140feefe {foobar}
155 | Added c () 155 | Added c ()
156 | 156 |
157 o 21:c39cabfcbbf7 {foobar} 157 o 21:c39cabfcbbf7 {foobar}
300 On clearing the topic 300 On clearing the topic
301 301
302 $ hg topic -r . --clear 302 $ hg topic -r . --clear
303 clearing empty topic "watwat" 303 clearing empty topic "watwat"
304 active topic 'watwat' is now empty 304 active topic 'watwat' is now empty
305 changed topic on 1 changes 305 cleared topic on 1 changesets
306 306
307 $ hg glog 307 $ hg glog
308 @ 31:c48d6d71b2d9 {} 308 @ 31:c48d6d71b2d9 {}
309 | Added h (book) 309 | Added h (book)
310 | 310 |
333 On changing the topic 333 On changing the topic
334 334
335 $ hg bookmark bookboo 335 $ hg bookmark bookboo
336 $ hg topic -r . movebook 336 $ hg topic -r . movebook
337 switching to topic movebook 337 switching to topic movebook
338 changed topic on 1 changes 338 changed topic on 1 changesets to "movebook"
339 $ hg glog 339 $ hg glog
340 @ 32:1b83d11095b9 {movebook} 340 @ 32:1b83d11095b9 {movebook}
341 | Added h (book bookboo) 341 | Added h (book bookboo)
342 | 342 |
343 o 26:7c76c271395f {bar} 343 o 26:7c76c271395f {bar}
374 26: secret 374 26: secret
375 375
376 $ hg topic -r . watwat 376 $ hg topic -r . watwat
377 switching to topic watwat 377 switching to topic watwat
378 1 new orphan changesets 378 1 new orphan changesets
379 changed topic on 1 changes 379 changed topic on 1 changesets to "watwat"
380 380
381 $ hg glog 381 $ hg glog
382 @ 33:894983f69e69 {watwat} 382 @ 33:894983f69e69 {watwat}
383 | Added g () 383 | Added g ()
384 | 384 |