Mercurial > hg
comparison tests/test-obsolete.t @ 28186:5ab6f0fde75f
bundlerepo: properly handle hidden linkrev in filelog (issue4945)
The bundlerepository have to do some special magic to handle linkrev of the
bundlerepo filerev. That logic was done from a repoview and obsolescence marker
affecting bundled changeset could lead to a crash. We now ensure we operate on
unfiltered repository.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 22 Feb 2016 18:35:40 +0100 |
parents | f2004e4908f3 |
children | c7f89ad87bae |
comparison
equal
deleted
inserted
replaced
28185:c7e8948627f3 | 28186:5ab6f0fde75f |
---|---|
1004 $ hg log -r 13bedc178fce | 1004 $ hg log -r 13bedc178fce |
1005 abort: hidden revision '13bedc178fce'! | 1005 abort: hidden revision '13bedc178fce'! |
1006 (use --hidden to access hidden revisions) | 1006 (use --hidden to access hidden revisions) |
1007 [255] | 1007 [255] |
1008 | 1008 |
1009 | 1009 Test ability to pull changeset with locally applying obsolescence markers |
1010 | 1010 (issue4945) |
1011 | |
1012 $ cd .. | |
1013 $ hg init issue4845 | |
1014 $ cd issue4845 | |
1015 | |
1016 $ echo foo > f0 | |
1017 $ hg add f0 | |
1018 $ hg ci -m '0' | |
1019 $ echo foo > f1 | |
1020 $ hg add f1 | |
1021 $ hg ci -m '1' | |
1022 $ echo foo > f2 | |
1023 $ hg add f2 | |
1024 $ hg ci -m '2' | |
1025 | |
1026 $ echo bar > f2 | |
1027 $ hg commit --amend --config experimetnal.evolution=createmarkers | |
1028 $ hg log -G | |
1029 @ 4:b0551702f918 (draft) [tip ] 2 | |
1030 | | |
1031 o 1:e016b03fd86f (draft) [ ] 1 | |
1032 | | |
1033 o 0:a78f55e5508c (draft) [ ] 0 | |
1034 | |
1035 $ hg log -G --hidden | |
1036 @ 4:b0551702f918 (draft) [tip ] 2 | |
1037 | | |
1038 | x 3:f27abbcc1f77 (draft) [ ] temporary amend commit for e008cf283490 | |
1039 | | | |
1040 | x 2:e008cf283490 (draft) [ ] 2 | |
1041 |/ | |
1042 o 1:e016b03fd86f (draft) [ ] 1 | |
1043 | | |
1044 o 0:a78f55e5508c (draft) [ ] 0 | |
1045 | |
1046 | |
1047 $ hg strip -r 1 --config extensions.strip= | |
1048 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1049 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg (glob) | |
1050 $ hg log -G | |
1051 @ 0:a78f55e5508c (draft) [tip ] 0 | |
1052 | |
1053 $ hg log -G --hidden | |
1054 @ 0:a78f55e5508c (draft) [tip ] 0 | |
1055 | |
1056 | |
1057 $ hg pull .hg/strip-backup/* | |
1058 pulling from .hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg | |
1059 searching for changes | |
1060 adding changesets | |
1061 adding manifests | |
1062 adding file changes | |
1063 added 2 changesets with 2 changes to 2 files | |
1064 (run 'hg update' to get a working copy) | |
1065 $ hg log -G | |
1066 o 2:b0551702f918 (draft) [tip ] 2 | |
1067 | | |
1068 o 1:e016b03fd86f (draft) [ ] 1 | |
1069 | | |
1070 @ 0:a78f55e5508c (draft) [ ] 0 | |
1071 | |
1072 $ hg log -G --hidden | |
1073 o 2:b0551702f918 (draft) [tip ] 2 | |
1074 | | |
1075 o 1:e016b03fd86f (draft) [ ] 1 | |
1076 | | |
1077 @ 0:a78f55e5508c (draft) [ ] 0 | |
1078 | |
1079 |