##// END OF EJS Templates
absorb: improve message for the case when changeset became empty...
Manuel Jacob -
r45730:c87bd1fe default
parent child Browse files
Show More
@@ -798,10 +798,7 b' class fixupstate(object):'
798 self.replacemap[ctx.node()] = lastcommitted.node()
798 self.replacemap[ctx.node()] = lastcommitted.node()
799 if memworkingcopy:
799 if memworkingcopy:
800 if willbecomenoop:
800 if willbecomenoop:
801 msg = _(
801 msg = _(b'%d file(s) changed, became empty as %s')
802 b'%d file(s) changed, became empty '
803 b'and became %s'
804 )
805 else:
802 else:
806 msg = _(b'%d file(s) changed, became %s')
803 msg = _(b'%d file(s) changed, became %s')
807 msg = msg % (
804 msg = msg % (
@@ -530,8 +530,8 b' Setting config rewrite.empty-successor=k'
530 $ hg absorb -av --config rewrite.empty-successor=keep | grep became
530 $ hg absorb -av --config rewrite.empty-successor=keep | grep became
531 0:bfafb49242db: 1 file(s) changed, became 5:1a2de97fc652
531 0:bfafb49242db: 1 file(s) changed, became 5:1a2de97fc652
532 1:115485984805: 2 file(s) changed, became 6:0c930dfab74c
532 1:115485984805: 2 file(s) changed, became 6:0c930dfab74c
533 2:30970dbf7b40: 2 file(s) changed, became empty and became 7:df6574ae635c
533 2:30970dbf7b40: 2 file(s) changed, became empty as 7:df6574ae635c
534 3:a393a58b9a85: 2 file(s) changed, became empty and became 8:ad4bd3462c9e
534 3:a393a58b9a85: 2 file(s) changed, became empty as 8:ad4bd3462c9e
535 4:1bb0e8cff87a: 2 file(s) changed, became 9:2dbed75af996
535 4:1bb0e8cff87a: 2 file(s) changed, became 9:2dbed75af996
536 $ hg log -T '{rev} {desc}\n' -Gp
536 $ hg log -T '{rev} {desc}\n' -Gp
537 @ 9 empty
537 @ 9 empty
General Comments 0
You need to be logged in to leave comments. Login now