Mercurial > hg-stable
comparison tests/test-rebase-inmemory.t @ 38547:731debab233f
rebase: improve output of --dry-run
Improved output when in dryrun, for user to make sure that
no change will be written to repository.
Differential Revision: https://phab.mercurial-scm.org/D3764
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 29 Jun 2018 01:35:09 +0530 |
parents | 999e5c218daf |
children | 572dff5c946e |
comparison
equal
deleted
inserted
replaced
38546:85e3aa21bcdc | 38547:731debab233f |
---|---|
206 abort: cannot specify both --dry-run and --abort | 206 abort: cannot specify both --dry-run and --abort |
207 [255] | 207 [255] |
208 | 208 |
209 Check dryrun gives correct results when there is no conflict in rebasing | 209 Check dryrun gives correct results when there is no conflict in rebasing |
210 $ hg rebase -s 2 -d 6 -n | 210 $ hg rebase -s 2 -d 6 -n |
211 starting dry-run rebase; repository will not be changed | |
211 rebasing 2:177f92b77385 "c" | 212 rebasing 2:177f92b77385 "c" |
212 rebasing 3:055a42cdd887 "d" | 213 rebasing 3:055a42cdd887 "d" |
213 rebasing 4:e860deea161a "e" | 214 rebasing 4:e860deea161a "e" |
214 there will be no conflict, you can rebase | 215 dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase |
215 | 216 |
216 $ hg diff | 217 $ hg diff |
217 $ hg status | 218 $ hg status |
218 | 219 |
219 $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | 220 $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" |
238 o 0:cb9a9f314b8b test | 239 o 0:cb9a9f314b8b test |
239 a | 240 a |
240 | 241 |
241 Check dryrun working with --collapse when there is no conflict | 242 Check dryrun working with --collapse when there is no conflict |
242 $ hg rebase -s 2 -d 6 -n --collapse | 243 $ hg rebase -s 2 -d 6 -n --collapse |
244 starting dry-run rebase; repository will not be changed | |
243 rebasing 2:177f92b77385 "c" | 245 rebasing 2:177f92b77385 "c" |
244 rebasing 3:055a42cdd887 "d" | 246 rebasing 3:055a42cdd887 "d" |
245 rebasing 4:e860deea161a "e" | 247 rebasing 4:e860deea161a "e" |
246 there will be no conflict, you can rebase | 248 dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase |
247 | 249 |
248 Check dryrun gives correct results when there is conflict in rebasing | 250 Check dryrun gives correct results when there is conflict in rebasing |
249 Make a conflict: | 251 Make a conflict: |
250 $ hg up 6 -q | 252 $ hg up 6 -q |
251 $ echo conflict>e | 253 $ echo conflict>e |
274 | | 276 | |
275 o 0:cb9a9f314b8b test | 277 o 0:cb9a9f314b8b test |
276 a | 278 a |
277 | 279 |
278 $ hg rebase -s 2 -d 7 -n | 280 $ hg rebase -s 2 -d 7 -n |
281 starting dry-run rebase; repository will not be changed | |
279 rebasing 2:177f92b77385 "c" | 282 rebasing 2:177f92b77385 "c" |
280 rebasing 3:055a42cdd887 "d" | 283 rebasing 3:055a42cdd887 "d" |
281 rebasing 4:e860deea161a "e" | 284 rebasing 4:e860deea161a "e" |
282 merging e | 285 merging e |
283 transaction abort! | 286 transaction abort! |
311 o 0:cb9a9f314b8b test | 314 o 0:cb9a9f314b8b test |
312 a | 315 a |
313 | 316 |
314 Check dryrun working with --collapse when there is conflicts | 317 Check dryrun working with --collapse when there is conflicts |
315 $ hg rebase -s 2 -d 7 -n --collapse | 318 $ hg rebase -s 2 -d 7 -n --collapse |
319 starting dry-run rebase; repository will not be changed | |
316 rebasing 2:177f92b77385 "c" | 320 rebasing 2:177f92b77385 "c" |
317 rebasing 3:055a42cdd887 "d" | 321 rebasing 3:055a42cdd887 "d" |
318 rebasing 4:e860deea161a "e" | 322 rebasing 4:e860deea161a "e" |
319 merging e | 323 merging e |
320 hit a merge conflict | 324 hit a merge conflict |