##// END OF EJS Templates
rebase: remove messages for nullmerge and revignored (BC)...
Jun Wu -
r33843:437e317d default
parent child Browse files
Show More
@@ -440,9 +440,9 b' class rebaseruntime(object):'
440 self.state[rev] = p1
440 self.state[rev] = p1
441 ui.debug('next revision set to %s\n' % p1)
441 ui.debug('next revision set to %s\n' % p1)
442 elif self.state[rev] == nullmerge:
442 elif self.state[rev] == nullmerge:
443 ui.debug('ignoring null merge rebase of %s\n' % rev)
443 pass
444 elif self.state[rev] == revignored:
444 elif self.state[rev] == revignored:
445 ui.status(_('not rebasing ignored %s\n') % desc)
445 pass
446 else:
446 else:
447 ui.status(_('already rebased %s as %s\n') %
447 ui.status(_('already rebased %s as %s\n') %
448 (desc, repo[self.state[rev]]))
448 (desc, repo[self.state[rev]]))
@@ -235,10 +235,6 b' Check that the right ancestors is used w'
235 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
235 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
236 rebase onto 4bc80088dc6b starting from e31216eec445
236 rebase onto 4bc80088dc6b starting from e31216eec445
237 rebase status stored
237 rebase status stored
238 ignoring null merge rebase of 3
239 ignoring null merge rebase of 4
240 ignoring null merge rebase of 6
241 ignoring null merge rebase of 8
242 rebasing 9:e31216eec445 "more changes to f1"
238 rebasing 9:e31216eec445 "more changes to f1"
243 future parents are 2 and -1
239 future parents are 2 and -1
244 rebase status stored
240 rebase status stored
@@ -413,7 +409,6 b' Test rebase with obsstore turned on and '
413 continue: hg rebase --continue
409 continue: hg rebase --continue
414 $ hg rebase --continue --config experimental.stabilization=none
410 $ hg rebase --continue --config experimental.stabilization=none
415 rebasing 1:112478962961 "B" (B)
411 rebasing 1:112478962961 "B" (B)
416 not rebasing ignored 2:26805aba1e60 "C" (C)
417 rebasing 3:f585351a92f8 "D" (D)
412 rebasing 3:f585351a92f8 "D" (D)
418 warning: orphaned descendants detected, not stripping 112478962961
413 warning: orphaned descendants detected, not stripping 112478962961
419 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
414 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob)
@@ -450,7 +450,6 b' Test multiple root handling'
450 $ hg rebase --dest 4 --rev '7+11+9'
450 $ hg rebase --dest 4 --rev '7+11+9'
451 rebasing 9:cf44d2f5a9f4 "D"
451 rebasing 9:cf44d2f5a9f4 "D"
452 rebasing 7:02de42196ebe "H"
452 rebasing 7:02de42196ebe "H"
453 not rebasing ignored 10:7c6027df6a99 "B"
454 rebasing 11:0d8f238b634c "C" (tip)
453 rebasing 11:0d8f238b634c "C" (tip)
455 $ hg log -G
454 $ hg log -G
456 o 14:1e8370e38cca C
455 o 14:1e8370e38cca C
@@ -491,8 +490,6 b' Detach both parents'
491 $ hg rebase -d G -r 'B + D + F'
490 $ hg rebase -d G -r 'B + D + F'
492 rebasing 1:112478962961 "B" (B)
491 rebasing 1:112478962961 "B" (B)
493 rebasing 2:b18e25de2cf5 "D" (D)
492 rebasing 2:b18e25de2cf5 "D" (D)
494 not rebasing ignored 4:26805aba1e60 "C" (C)
495 not rebasing ignored 5:4b61ff5c62e2 "E" (E)
496 rebasing 6:f15c3adaf214 "F" (F tip)
493 rebasing 6:f15c3adaf214 "F" (F tip)
497 abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
494 abort: cannot rebase 6:f15c3adaf214 without moving at least one of its parents
498 [255]
495 [255]
@@ -546,7 +543,6 b' test on rebase dropping a merge'
546 $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
543 $ hg rebase --dest 6 --rev '((desc(H) + desc(D))::) - desc(M)'
547 rebasing 3:32af7686d403 "D"
544 rebasing 3:32af7686d403 "D"
548 rebasing 7:02de42196ebe "H"
545 rebasing 7:02de42196ebe "H"
549 not rebasing ignored 8:53a6a128b2b7 "M"
550 rebasing 9:4bde274eefcf "I" (tip)
546 rebasing 9:4bde274eefcf "I" (tip)
551 $ hg log -G
547 $ hg log -G
552 @ 12:acd174b7ab39 I
548 @ 12:acd174b7ab39 I
@@ -81,7 +81,6 b' the hole (B below), not on top of the de'
81 > A
81 > A
82 > EOF
82 > EOF
83 already rebased 1:112478962961 "B" (B)
83 already rebased 1:112478962961 "B" (B)
84 not rebasing ignored 2:26805aba1e60 "C" (C)
85 rebasing 3:f585351a92f8 "D" (D tip)
84 rebasing 3:f585351a92f8 "D" (D tip)
86 o 4: D
85 o 4: D
87 |
86 |
General Comments 0
You need to be logged in to leave comments. Login now