Mercurial > hg
diff tests/test-rebase-obsolete.t @ 35711:35a0f6f31eef
update: display the obsfate of hidden revision we update to
Display the same message we added recently to the filtered error message when
updating to a hidden obsolete changeset.
Differential Revision: https://phab.mercurial-scm.org/D1869
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 16 Jan 2018 14:08:54 +0100 |
parents | 1a09dad8b85a |
children | a1a5c3842b6f |
line wrap: on
line diff
--- a/tests/test-rebase-obsolete.t Sun Jan 14 00:02:40 2018 -0800 +++ b/tests/test-rebase-obsolete.t Tue Jan 16 14:08:54 2018 +0100 @@ -282,6 +282,7 @@ $ hg --hidden up -qr 'first(hidden())' updating to a hidden changeset 42ccdea3bb16 + (hidden revision '42ccdea3bb16' is pruned) $ hg rebase --rev 13 --dest 15 rebasing 13:98f6af4ee953 "C" $ hg log -G @@ -615,6 +616,7 @@ $ hg up --hidden 9 updating to a hidden changeset 4bde274eefcf + (hidden revision '4bde274eefcf' was rewritten as: acd174b7ab39) 3 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo J > J $ hg add J @@ -736,6 +738,7 @@ $ hg commit --amend -m B2 $ hg up --hidden 'desc(B0)' updating to a hidden changeset a8b11f55fb19 + (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo C > C $ hg add C @@ -761,6 +764,7 @@ $ hg up --hidden 'desc(B0)' updating to a hidden changeset a8b11f55fb19 + (hidden revision 'a8b11f55fb19' was rewritten as: 261e70097290) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo D > D $ hg add D @@ -878,6 +882,7 @@ $ hg commit --amend -m "10'" $ hg up 10 --hidden updating to a hidden changeset 121d9e3bc4c6 + (hidden revision '121d9e3bc4c6' was rewritten as: 77d874d096a2) 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo "bar" > foo $ hg add foo @@ -1633,6 +1638,7 @@ $ hg update -q $C --hidden updating to a hidden changeset 7829726be4dc + (hidden revision '7829726be4dc' is pruned) $ hg rebase -s $B -d $D rebasing 1:2ec65233581b "B" merging D