Mercurial > evolve

comparison tests/test-fixup.t @ 6231:d0f0a7b68d2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: merge with stable
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 26 Apr 2022 17:39:11 +0400
parents d18e16b9b793 4298ae0b966d
children 1328195f76a9 237f99ee3d64
comparison
equal deleted inserted replaced
6222:6020b7e92a86 6231:d0f0a7b68d2d
54 $ mkcommit baz 54 $ mkcommit baz
55 55
56 amending the middle of the stack 56 amending the middle of the stack
57 -------------------------------- 57 --------------------------------
58 58
59 $ hg bookmark bm
59 $ echo 'hookah bar' > bar 60 $ echo 'hookah bar' > bar
60 $ hg fixup -r 'desc(bar)' 61 $ hg fixup -r 'desc(bar)'
62 (leaving bookmark bm)
61 1 new orphan changesets 63 1 new orphan changesets
62 64
63 $ hg diff -c tip 65 $ hg diff -c tip
64 diff --git a/bar b/bar 66 diff --git a/bar b/bar
65 new file mode 100644 67 new file mode 100644
68 @@ -0,0 +1,1 @@ 70 @@ -0,0 +1,1 @@
69 +hookah bar 71 +hookah bar
70 72
71 $ hg glog 73 $ hg glog
72 o 5:2eec5320cfc7 bar 74 o 5:2eec5320cfc7 bar
73 | () draft 75 | (bm) draft
74 | @ 3:fd2f632e47ab temporary fixup commit 76 | @ 3:fd2f632e47ab temporary fixup commit
75 | | () draft 77 | | () draft
76 | * 2:a425495a8e64 baz 78 | * 2:a425495a8e64 baz
77 | | () draft orphan 79 | | () draft orphan
78 | x 1:c0c7cf58edc5 bar 80 | x 1:c0c7cf58edc5 bar
80 o 0:e63c23eaa88a foo 82 o 0:e63c23eaa88a foo
81 () draft 83 () draft
82 84
83 $ hg glog --hidden 85 $ hg glog --hidden
84 o 5:2eec5320cfc7 bar 86 o 5:2eec5320cfc7 bar
85 | () draft 87 | (bm) draft
86 | x 4:4869c1db2884 temporary fixup commit 88 | x 4:4869c1db2884 temporary fixup commit
87 | | () draft 89 | | () draft
88 | | @ 3:fd2f632e47ab temporary fixup commit 90 | | @ 3:fd2f632e47ab temporary fixup commit
89 | | | () draft 91 | | | () draft
90 | | * 2:a425495a8e64 baz 92 | | * 2:a425495a8e64 baz
92 | x 1:c0c7cf58edc5 bar 94 | x 1:c0c7cf58edc5 bar
93 |/ () draft 95 |/ () draft
94 o 0:e63c23eaa88a foo 96 o 0:e63c23eaa88a foo
95 () draft 97 () draft
96 98
99 using --dry-run should only print actions (issue6669)
100
101 $ hg evolve --dry-run
102 update:[5] bar
103
104 $ hg evolve --dry-run --any
105 update:[5] bar
106 move:[2] baz
107 atop:[5] bar
108 hg rebase -r a425495a8e64 -d 2eec5320cfc7
109
97 $ hg evolve 110 $ hg evolve
98 update:[5] bar 111 update:[5] bar
99 1 files updated, 0 files merged, 1 files removed, 0 files unresolved 112 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
100 working directory is now at 2eec5320cfc7 113 working directory is now at 2eec5320cfc7
101 114
105 118
106 $ hg glog 119 $ hg glog
107 o 6:eb1755d9f810 baz 120 o 6:eb1755d9f810 baz
108 | () draft 121 | () draft
109 @ 5:2eec5320cfc7 bar 122 @ 5:2eec5320cfc7 bar
110 | () draft 123 | (bm) draft
111 o 0:e63c23eaa88a foo 124 o 0:e63c23eaa88a foo
112 () draft 125 () draft
113 126
114 amending working directory parent in secret phase 127 amending working directory parent in secret phase
115 ------------------------------------------------- 128 -------------------------------------------------
126 working directory is now at 12b5e442244f 139 working directory is now at 12b5e442244f
127 $ hg glog 140 $ hg glog
128 @ 9:12b5e442244f baz 141 @ 9:12b5e442244f baz
129 | () secret 142 | () secret
130 o 5:2eec5320cfc7 bar 143 o 5:2eec5320cfc7 bar
131 | () draft 144 | (bm) draft
132 o 0:e63c23eaa88a foo 145 o 0:e63c23eaa88a foo
133 () draft 146 () draft
134 147
135 testing --abort/--continue 148 testing --abort/--continue
136 -------------------------- 149 --------------------------
147 o 10:c90c517f86b3 update foo 160 o 10:c90c517f86b3 update foo
148 | () draft 161 | () draft
149 | @ 9:12b5e442244f baz 162 | @ 9:12b5e442244f baz
150 | | () secret 163 | | () secret
151 | o 5:2eec5320cfc7 bar 164 | o 5:2eec5320cfc7 bar
152 |/ () draft 165 |/ (bm) draft
153 o 0:e63c23eaa88a foo 166 o 0:e63c23eaa88a foo
154 () draft 167 () draft
155 168
156 testing --abort flag 169 testing --abort flag
157 170
247 | @ 11:1c9958e73c2d temporary fixup commit 260 | @ 11:1c9958e73c2d temporary fixup commit
248 | | () secret 261 | | () secret
249 | o 9:12b5e442244f baz 262 | o 9:12b5e442244f baz
250 | | () secret 263 | | () secret
251 | o 5:2eec5320cfc7 bar 264 | o 5:2eec5320cfc7 bar
252 |/ () draft 265 |/ (bm) draft
253 o 0:e63c23eaa88a foo 266 o 0:e63c23eaa88a foo
254 () draft 267 () draft
255 268
256 $ hg evolve 269 $ hg evolve
257 update:[13] update foo 270 update:[13] update foo
284 | @ 14:6b0b1270d7dd temporary fixup commit 297 | @ 14:6b0b1270d7dd temporary fixup commit
285 | | () secret 298 | | () secret
286 | o 9:12b5e442244f baz 299 | o 9:12b5e442244f baz
287 | | () secret 300 | | () secret
288 | o 5:2eec5320cfc7 bar 301 | o 5:2eec5320cfc7 bar
289 |/ () draft 302 |/ (bm) draft
290 o 0:e63c23eaa88a foo 303 o 0:e63c23eaa88a foo
291 () draft 304 () draft
292 305
293 $ hg evolve 306 $ hg evolve
294 update:[16] update foo 307 update:[16] update foo
308 | @ 17:4a9c4d14d447 temporary fixup commit 321 | @ 17:4a9c4d14d447 temporary fixup commit
309 | | () draft 322 | | () draft
310 | | o 16:0dd54868f420 update foo 323 | | o 16:0dd54868f420 update foo
311 | |/ () draft 324 | |/ () draft
312 o | 5:2eec5320cfc7 bar 325 o | 5:2eec5320cfc7 bar
313 |/ () draft 326 |/ (bm) draft
314 o 0:e63c23eaa88a foo 327 o 0:e63c23eaa88a foo
315 () draft 328 () draft
316 329
317 $ hg evolve 330 $ hg evolve
318 update:[19] baz 331 update:[19] baz
323 @ 19:b50fd0850076 baz 336 @ 19:b50fd0850076 baz
324 | () secret 337 | () secret
325 | o 16:0dd54868f420 update foo 338 | o 16:0dd54868f420 update foo
326 | | () draft 339 | | () draft
327 o | 5:2eec5320cfc7 bar 340 o | 5:2eec5320cfc7 bar
328 |/ () draft 341 |/ (bm) draft
329 o 0:e63c23eaa88a foo 342 o 0:e63c23eaa88a foo
330 () draft 343 () draft
331 $ hg diff -c . 344 $ hg diff -c .
332 diff --git a/baz b/baz 345 diff --git a/baz b/baz
333 new file mode 100644 346 new file mode 100644