##// END OF EJS Templates
bundlerepo: properly handle hidden linkrev in filelog (issue4945)...
Pierre-Yves David -
r28220:0209bdd5 stable
parent child Browse files
Show More
@@ -362,7 +362,8 b' class bundlerepository(localrepo.localre'
362
362
363 if f in self.bundlefilespos:
363 if f in self.bundlefilespos:
364 self.bundle.seek(self.bundlefilespos[f])
364 self.bundle.seek(self.bundlefilespos[f])
365 return bundlefilelog(self.svfs, f, self.bundle, self.changelog.rev)
365 linkmapper = self.unfiltered().changelog.rev
366 return bundlefilelog(self.svfs, f, self.bundle, linkmapper)
366 else:
367 else:
367 return filelog.filelog(self.svfs, f)
368 return filelog.filelog(self.svfs, f)
368
369
@@ -1004,5 +1004,74 b' bookmarks change'
1004 (use --hidden to access hidden revisions)
1004 (use --hidden to access hidden revisions)
1005 [255]
1005 [255]
1006
1006
1007 Test ability to pull changeset with locally applying obsolescence markers
1008 (issue4945)
1009
1010 $ cd ..
1011 $ hg init issue4845
1012 $ cd issue4845
1013
1014 $ echo foo > f0
1015 $ hg add f0
1016 $ hg ci -m '0'
1017 $ echo foo > f1
1018 $ hg add f1
1019 $ hg ci -m '1'
1020 $ echo foo > f2
1021 $ hg add f2
1022 $ hg ci -m '2'
1023
1024 $ echo bar > f2
1025 $ hg commit --amend --config experimetnal.evolution=createmarkers
1026 $ hg log -G
1027 @ 4:b0551702f918 (draft) [tip ] 2
1028 |
1029 o 1:e016b03fd86f (draft) [ ] 1
1030 |
1031 o 0:a78f55e5508c (draft) [ ] 0
1032
1033 $ hg log -G --hidden
1034 @ 4:b0551702f918 (draft) [tip ] 2
1035 |
1036 | x 3:f27abbcc1f77 (draft) [ ] temporary amend commit for e008cf283490
1037 | |
1038 | x 2:e008cf283490 (draft) [ ] 2
1039 |/
1040 o 1:e016b03fd86f (draft) [ ] 1
1041 |
1042 o 0:a78f55e5508c (draft) [ ] 0
1007
1043
1008
1044
1045 $ hg strip -r 1 --config extensions.strip=
1046 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
1047 saved backup bundle to $TESTTMP/tmpe/issue4845/.hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg (glob)
1048 $ hg log -G
1049 @ 0:a78f55e5508c (draft) [tip ] 0
1050
1051 $ hg log -G --hidden
1052 @ 0:a78f55e5508c (draft) [tip ] 0
1053
1054
1055 $ hg pull .hg/strip-backup/*
1056 pulling from .hg/strip-backup/e016b03fd86f-c41c6bcc-backup.hg
1057 searching for changes
1058 adding changesets
1059 adding manifests
1060 adding file changes
1061 added 2 changesets with 2 changes to 2 files
1062 (run 'hg update' to get a working copy)
1063 $ hg log -G
1064 o 2:b0551702f918 (draft) [tip ] 2
1065 |
1066 o 1:e016b03fd86f (draft) [ ] 1
1067 |
1068 @ 0:a78f55e5508c (draft) [ ] 0
1069
1070 $ hg log -G --hidden
1071 o 2:b0551702f918 (draft) [tip ] 2
1072 |
1073 o 1:e016b03fd86f (draft) [ ] 1
1074 |
1075 @ 0:a78f55e5508c (draft) [ ] 0
1076
1077
General Comments 0
You need to be logged in to leave comments. Login now