Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 38499:999e5c218daf
rebase: suppress warning thrown when aborting rebase in case of dryrun
Before this patch dryrun output contained "rebase aborted" every
time we run rebase in dryrun mode and this warning does not sound
safe from a user prespective.
Differential Revision: https://phab.mercurial-scm.org/D3857
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 29 Jun 2018 01:05:08 +0530 |
parents | c892a30bafb9 |
children | 731debab233f |
comparison
equal
deleted
inserted
replaced
38498:c892a30bafb9 | 38499:999e5c218daf |
---|---|
210 $ hg rebase -s 2 -d 6 -n | 210 $ hg rebase -s 2 -d 6 -n |
211 rebasing 2:177f92b77385 "c" | 211 rebasing 2:177f92b77385 "c" |
212 rebasing 3:055a42cdd887 "d" | 212 rebasing 3:055a42cdd887 "d" |
213 rebasing 4:e860deea161a "e" | 213 rebasing 4:e860deea161a "e" |
214 there will be no conflict, you can rebase | 214 there will be no conflict, you can rebase |
215 rebase aborted | |
216 | 215 |
217 $ hg diff | 216 $ hg diff |
218 $ hg status | 217 $ hg status |
219 | 218 |
220 $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | 219 $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" |
243 $ hg rebase -s 2 -d 6 -n --collapse | 242 $ hg rebase -s 2 -d 6 -n --collapse |
244 rebasing 2:177f92b77385 "c" | 243 rebasing 2:177f92b77385 "c" |
245 rebasing 3:055a42cdd887 "d" | 244 rebasing 3:055a42cdd887 "d" |
246 rebasing 4:e860deea161a "e" | 245 rebasing 4:e860deea161a "e" |
247 there will be no conflict, you can rebase | 246 there will be no conflict, you can rebase |
248 rebase aborted | |
249 | 247 |
250 Check dryrun gives correct results when there is conflict in rebasing | 248 Check dryrun gives correct results when there is conflict in rebasing |
251 Make a conflict: | 249 Make a conflict: |
252 $ hg up 6 -q | 250 $ hg up 6 -q |
253 $ echo conflict>e | 251 $ echo conflict>e |
283 rebasing 4:e860deea161a "e" | 281 rebasing 4:e860deea161a "e" |
284 merging e | 282 merging e |
285 transaction abort! | 283 transaction abort! |
286 rollback completed | 284 rollback completed |
287 hit a merge conflict | 285 hit a merge conflict |
288 rebase aborted | |
289 [1] | 286 [1] |
290 $ hg diff | 287 $ hg diff |
291 $ hg status | 288 $ hg status |
292 $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" | 289 $ hg log -G --template "{rev}:{short(node)} {person(author)}\n{firstline(desc)} {topic}\n\n" |
293 @ 7:d2c195b28050 test | 290 @ 7:d2c195b28050 test |
319 rebasing 2:177f92b77385 "c" | 316 rebasing 2:177f92b77385 "c" |
320 rebasing 3:055a42cdd887 "d" | 317 rebasing 3:055a42cdd887 "d" |
321 rebasing 4:e860deea161a "e" | 318 rebasing 4:e860deea161a "e" |
322 merging e | 319 merging e |
323 hit a merge conflict | 320 hit a merge conflict |
324 rebase aborted | |
325 [1] | 321 [1] |