Mercurial > hg
comparison tests/test-rebase-pull.t @ 24170:fbc4d550a6ab
repair: setup hookargs when processing bundle2s
addchangegroup() modifies its behavior based on the transaction source.
This is incorrect for bundle2 repair files, causing rebases to abort when this
option is enabled.
This diff specifies the source type in the way recommended by comments in
bundle2.py and adds a test to ensure that rebases with the experimental option
work successfully.
author | Eric Sumner <ericsumner@fb.com> |
---|---|
date | Fri, 20 Feb 2015 13:55:01 -0800 |
parents | aa4a1672583e |
children | c93f91c1db1c |
comparison
equal
deleted
inserted
replaced
24168:4e865115566e | 24170:fbc4d550a6ab |
---|---|
163 | | 163 | |
164 o 1: 'C2' | 164 o 1: 'C2' |
165 | | 165 | |
166 o 0: 'C1' | 166 o 0: 'C1' |
167 | 167 |
168 | 168 pull --rebase works with bundle2 turned on |
169 | 169 |
170 $ cd ../a | |
171 $ echo R4 > R4 | |
172 $ hg ci -Am R4 | |
173 adding R4 | |
174 $ hg tglog | |
175 @ 5: 'R4' | |
176 | | |
177 o 4: 'R3' | |
178 | | |
179 o 3: 'R2' | |
180 | | |
181 o 2: 'R1' | |
182 | | |
183 o 1: 'C2' | |
184 | | |
185 o 0: 'C1' | |
186 | |
187 $ cd ../c | |
188 $ hg pull --rebase --config experimental.bundle2-exp=True --config experimental.strip-bundle2-version=02 | |
189 pulling from $TESTTMP/a (glob) | |
190 searching for changes | |
191 adding changesets | |
192 adding manifests | |
193 adding file changes | |
194 added 1 changesets with 1 changes to 1 files (+1 heads) | |
195 rebasing 5:518d153c0ba3 "L1" | |
196 saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-backup.hg (glob) | |
197 $ hg tglog | |
198 @ 6: 'L1' | |
199 | | |
200 o 5: 'R4' | |
201 | | |
202 o 4: 'R3' | |
203 | | |
204 o 3: 'R2' | |
205 | | |
206 o 2: 'R1' | |
207 | | |
208 o 1: 'C2' | |
209 | | |
210 o 0: 'C1' | |
211 |