equal
deleted
inserted
replaced
85 $ hg commit -Aqm xxy |
85 $ hg commit -Aqm xxy |
86 |
86 |
87 $ hg pull -q |
87 $ hg pull -q |
88 $ hg rebase -d tip |
88 $ hg rebase -d tip |
89 rebasing 1:4549721d828f "xx2" |
89 rebasing 1:4549721d828f "xx2" |
90 note: rebase of 1:4549721d828f "xx2" created no changes to commit |
90 note: not rebasing 1:4549721d828f "xx2", its destination already has all its changes |
91 rebasing 2:5ef6d97e851c "xxy" |
91 rebasing 2:5ef6d97e851c "xxy" |
92 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob) |
92 saved backup bundle to $TESTTMP/shallow/.hg/strip-backup/4549721d828f-b084e33c-rebase.hg (glob) |
93 $ hg log -f x --template '{node|short}\n' |
93 $ hg log -f x --template '{node|short}\n' |
94 4ae8e31c85ef |
94 4ae8e31c85ef |
95 0632994590a8 |
95 0632994590a8 |