##// END OF EJS Templates
fix: update commit hash references in the new commits...
Matt Harbison -
r46305:04de8a1e default
parent child Browse files
Show More
@@ -815,8 +815,14 b' def replacerev(ui, repo, ctx, filedata, '
815 if copysource:
815 if copysource:
816 wctx.markcopied(path, copysource)
816 wctx.markcopied(path, copysource)
817
817
818 desc = rewriteutil.update_hash_refs(
819 repo,
820 ctx.description(),
821 {oldnode: [newnode] for oldnode, newnode in replacements.items()},
822 )
823
818 memctx = wctx.tomemctx(
824 memctx = wctx.tomemctx(
819 text=ctx.description(),
825 text=desc,
820 branch=ctx.branch(),
826 branch=ctx.branch(),
821 extra=extra,
827 extra=extra,
822 date=ctx.date(),
828 date=ctx.date(),
@@ -85,7 +85,7 b' The computation of changed lines is orth'
85 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
85 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
86 (branch merge, don't forget to commit)
86 (branch merge, don't forget to commit)
87 $ printf "hhhh\n" > h
87 $ printf "hhhh\n" > h
88 $ hg commit -Am "change H"
88 $ hg commit -Am "change H (child of b53d63e816fb and 0e49f92ee6e9)"
89 adding h
89 adding h
90 $ hg merge -r 4
90 $ hg merge -r 4
91 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
91 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -96,7 +96,7 b' The computation of changed lines is orth'
96 $ hg checkout 2
96 $ hg checkout 2
97 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
97 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
98 $ printf "jjjj\n" > j
98 $ printf "jjjj\n" > j
99 $ hg commit -Am "change J"
99 $ hg commit -Am "change J (child of 7f371349286e)"
100 adding j
100 adding j
101 created new head
101 created new head
102 $ hg checkout 7
102 $ hg checkout 7
@@ -105,26 +105,26 b' The computation of changed lines is orth'
105 $ hg add
105 $ hg add
106 adding k
106 adding k
107
107
108 $ hg log --graph --template '{rev} {desc}\n'
108 $ hg log --graph --template '{rev}:{node|short} {desc}\n'
109 o 9 change J
109 o 9:884041ccc490 change J (child of 7f371349286e)
110 |
110 |
111 | o 8 change I
111 | o 8:b7c772105fd2 change I
112 | |\
112 | |\
113 | | @ 7 change H
113 | | @ 7:4e7b9312dad2 change H (child of b53d63e816fb and 0e49f92ee6e9)
114 | | |\
114 | | |\
115 | | | o 6 change G
115 | | | o 6:0e49f92ee6e9 change G
116 | | | |
116 | | | |
117 | | o | 5 change F
117 | | o | 5:b53d63e816fb change F
118 | | |/
118 | | |/
119 | o | 4 change E
119 | o | 4:ddad58af5e51 change E
120 |/| |
120 |/| |
121 | o | 3 change D
121 | o | 3:c015ebfd2bfe change D
122 | |/
122 | |/
123 o | 2 change C
123 o | 2:7f371349286e change C
124 | |
124 | |
125 o | 1 change B
125 o | 1:388fdd33fea0 change B
126 |/
126 |/
127 o 0 change A
127 o 0:a55a84d97a24 change A
128
128
129
129
130 Fix all but the root revision and its four children.
130 Fix all but the root revision and its four children.
@@ -137,26 +137,26 b' parent pointers have been accurately set'
137 (though it is rendered in a slightly different order now).
137 (though it is rendered in a slightly different order now).
138
138
139 #if obsstore-on
139 #if obsstore-on
140 $ hg log --graph --template '{rev} {desc}\n'
140 $ hg log --graph --template '{rev}:{node|short} {desc}\n'
141 o 14 change J
141 o 14:d8d0e7974598 change J (child of 89de0da1d5da)
142 |
142 |
143 | o 13 change I
143 | o 13:4fc0b354461e change I
144 | |\
144 | |\
145 | | @ 12 change H
145 | | @ 12:1c45f3923443 change H (child of b53d63e816fb and 0e49f92ee6e9)
146 | | |\
146 | | |\
147 | o | | 11 change E
147 | o | | 11:d75754455722 change E
148 |/| | |
148 |/| | |
149 o | | | 10 change C
149 o | | | 10:89de0da1d5da change C
150 | | | |
150 | | | |
151 | | | o 6 change G
151 | | | o 6:0e49f92ee6e9 change G
152 | | | |
152 | | | |
153 | | o | 5 change F
153 | | o | 5:b53d63e816fb change F
154 | | |/
154 | | |/
155 | o / 3 change D
155 | o / 3:c015ebfd2bfe change D
156 | |/
156 | |/
157 o / 1 change B
157 o / 1:388fdd33fea0 change B
158 |/
158 |/
159 o 0 change A
159 o 0:a55a84d97a24 change A
160
160
161 $ C=10
161 $ C=10
162 $ E=11
162 $ E=11
@@ -164,26 +164,26 b' parent pointers have been accurately set'
164 $ I=13
164 $ I=13
165 $ J=14
165 $ J=14
166 #else
166 #else
167 $ hg log --graph --template '{rev} {desc}\n'
167 $ hg log --graph --template '{rev}:{node|short} {desc}\n'
168 o 9 change J
168 o 9:d8d0e7974598 change J (child of 89de0da1d5da)
169 |
169 |
170 | o 8 change I
170 | o 8:4fc0b354461e change I
171 | |\
171 | |\
172 | | @ 7 change H
172 | | @ 7:1c45f3923443 change H (child of b53d63e816fb and 0e49f92ee6e9)
173 | | |\
173 | | |\
174 | o | | 6 change E
174 | o | | 6:d75754455722 change E
175 |/| | |
175 |/| | |
176 o | | | 5 change C
176 o | | | 5:89de0da1d5da change C
177 | | | |
177 | | | |
178 | | | o 4 change G
178 | | | o 4:0e49f92ee6e9 change G
179 | | | |
179 | | | |
180 | | o | 3 change F
180 | | o | 3:b53d63e816fb change F
181 | | |/
181 | | |/
182 | o / 2 change D
182 | o / 2:c015ebfd2bfe change D
183 | |/
183 | |/
184 o / 1 change B
184 o / 1:388fdd33fea0 change B
185 |/
185 |/
186 o 0 change A
186 o 0:a55a84d97a24 change A
187
187
188 $ C=5
188 $ C=5
189 $ E=6
189 $ E=6
General Comments 0
You need to be logged in to leave comments. Login now