Mercurial > evolve

comparison tests/test-prev-next.t @ 1500:b4dfafda72c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
next: add support for --dry-run also adds support to prev
author timeless@mozdev.org
date Thu, 10 Sep 2015 16:24:50 -0400
parents ee5391999f2d
children 970a4c13ebc3
comparison
equal deleted inserted replaced
1499:c936a243346a 1500:b4dfafda72c2
20 [0] added a 20 [0] added a
21 $ hg bookmarks 21 $ hg bookmarks
22 * mark 0:a154386e50d1 22 * mark 0:a154386e50d1
23 23
24 hg next -B should move active bookmark 24 hg next -B should move active bookmark
25 $ hg next -B --dry-run
26 hg update 1;
27 hg bookmark mark -r 1;
28 [1] added b
25 $ hg next -B 29 $ hg next -B
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 30 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
27 [1] added b 31 [1] added b
28 $ hg bookmarks 32 $ hg bookmarks
29 * mark 1:6e742c9127b3 33 * mark 1:6e742c9127b3
30 34
31 hg prev should unset active bookmark 35 hg prev should unset active bookmark
36 $ hg prev --dry-run
37 hg update 0;
38 [0] added a
32 $ hg prev 39 $ hg prev
33 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 40 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
34 [0] added a 41 [0] added a
35 $ hg bookmarks 42 $ hg bookmarks
36 mark 1:6e742c9127b3 43 mark 1:6e742c9127b3
150 1 new unstable changesets 157 1 new unstable changesets
151 $ hg next 158 $ hg next
152 no children 159 no children
153 (1 unstable changesets to be evolved here, do you want --evolve?) 160 (1 unstable changesets to be evolved here, do you want --evolve?)
154 [1] 161 [1]
162 $ hg next --evolve --dry-run
163 move:[2] added c
164 atop:[3] added b (2)
165 hg rebase -r 4e26ef31f919 -d 9ad178109a19
166 working directory now at 9ad178109a19
155 $ hg next --evolve 167 $ hg next --evolve
156 move:[2] added c 168 move:[2] added c
157 atop:[3] added b (2) 169 atop:[3] added b (2)
158 working directory now at e3b6d5df389b 170 working directory now at e3b6d5df389b
159 171