equal
deleted
inserted
replaced
46 $ cd ../b |
46 $ cd ../b |
47 |
47 |
48 Now b has one revision to be pulled from a: |
48 Now b has one revision to be pulled from a: |
49 |
49 |
50 $ hg pull --rebase |
50 $ hg pull --rebase |
51 pulling from $TESTTMP/a (glob) |
51 pulling from $TESTTMP/a |
52 searching for changes |
52 searching for changes |
53 adding changesets |
53 adding changesets |
54 adding manifests |
54 adding manifests |
55 adding file changes |
55 adding file changes |
56 added 1 changesets with 1 changes to 1 files (+1 heads) |
56 added 1 changesets with 1 changes to 1 files (+1 heads) |
57 new changesets 77ae9631bcca |
57 new changesets 77ae9631bcca |
58 rebasing 2:ff8d69a621f9 "L1" |
58 rebasing 2:ff8d69a621f9 "L1" |
59 saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
59 saved backup bundle to $TESTTMP/b/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg |
60 |
60 |
61 $ hg tglog |
61 $ hg tglog |
62 @ 3: d80cc2da061e 'L1' |
62 @ 3: d80cc2da061e 'L1' |
63 | |
63 | |
64 o 2: 77ae9631bcca 'R1' |
64 o 2: 77ae9631bcca 'R1' |
68 o 0: 05d58a0c15dd 'C1' |
68 o 0: 05d58a0c15dd 'C1' |
69 |
69 |
70 Re-run: |
70 Re-run: |
71 |
71 |
72 $ hg pull --rebase |
72 $ hg pull --rebase |
73 pulling from $TESTTMP/a (glob) |
73 pulling from $TESTTMP/a |
74 searching for changes |
74 searching for changes |
75 no changes found |
75 no changes found |
76 |
76 |
77 Abort pull early if working dir is not clean: |
77 Abort pull early if working dir is not clean: |
78 |
78 |
136 |
136 |
137 $ cd ../c |
137 $ cd ../c |
138 |
138 |
139 $ hg book norebase |
139 $ hg book norebase |
140 $ hg pull --rebase |
140 $ hg pull --rebase |
141 pulling from $TESTTMP/a (glob) |
141 pulling from $TESTTMP/a |
142 searching for changes |
142 searching for changes |
143 adding changesets |
143 adding changesets |
144 adding manifests |
144 adding manifests |
145 adding file changes |
145 adding file changes |
146 added 1 changesets with 1 changes to 1 files |
146 added 1 changesets with 1 changes to 1 files |
155 ~ |
155 ~ |
156 |
156 |
157 pull --rebase --update should ignore --update: |
157 pull --rebase --update should ignore --update: |
158 |
158 |
159 $ hg pull --rebase --update |
159 $ hg pull --rebase --update |
160 pulling from $TESTTMP/a (glob) |
160 pulling from $TESTTMP/a |
161 searching for changes |
161 searching for changes |
162 no changes found |
162 no changes found |
163 |
163 |
164 pull --rebase doesn't update if nothing has been pulled: |
164 pull --rebase doesn't update if nothing has been pulled: |
165 |
165 |
166 $ hg up -q 1 |
166 $ hg up -q 1 |
167 |
167 |
168 $ hg pull --rebase |
168 $ hg pull --rebase |
169 pulling from $TESTTMP/a (glob) |
169 pulling from $TESTTMP/a |
170 searching for changes |
170 searching for changes |
171 no changes found |
171 no changes found |
172 |
172 |
173 $ hg tglog -l 1 |
173 $ hg tglog -l 1 |
174 o 2: 77ae9631bcca 'R1' |
174 o 2: 77ae9631bcca 'R1' |
204 $ echo L1 > L1 |
204 $ echo L1 > L1 |
205 $ hg ci -Am L1 |
205 $ hg ci -Am L1 |
206 adding L1 |
206 adding L1 |
207 created new head |
207 created new head |
208 $ hg pull --rev tip --rebase |
208 $ hg pull --rev tip --rebase |
209 pulling from $TESTTMP/a (glob) |
209 pulling from $TESTTMP/a |
210 searching for changes |
210 searching for changes |
211 adding changesets |
211 adding changesets |
212 adding manifests |
212 adding manifests |
213 adding file changes |
213 adding file changes |
214 added 2 changesets with 2 changes to 2 files |
214 added 2 changesets with 2 changes to 2 files |
215 new changesets 31cd3a05214e:770a61882ace |
215 new changesets 31cd3a05214e:770a61882ace |
216 rebasing 3:ff8d69a621f9 "L1" |
216 rebasing 3:ff8d69a621f9 "L1" |
217 saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg (glob) |
217 saved backup bundle to $TESTTMP/c/.hg/strip-backup/ff8d69a621f9-160fa373-rebase.hg |
218 $ hg tglog |
218 $ hg tglog |
219 @ 5: 518d153c0ba3 'L1' |
219 @ 5: 518d153c0ba3 'L1' |
220 | |
220 | |
221 o 4: 770a61882ace 'R3' |
221 o 4: 770a61882ace 'R3' |
222 | |
222 | |
247 | |
247 | |
248 o 0: 05d58a0c15dd 'C1' |
248 o 0: 05d58a0c15dd 'C1' |
249 |
249 |
250 $ cd ../c |
250 $ cd ../c |
251 $ hg pull --rebase |
251 $ hg pull --rebase |
252 pulling from $TESTTMP/a (glob) |
252 pulling from $TESTTMP/a |
253 searching for changes |
253 searching for changes |
254 adding changesets |
254 adding changesets |
255 adding manifests |
255 adding manifests |
256 adding file changes |
256 adding file changes |
257 added 1 changesets with 1 changes to 1 files (+1 heads) |
257 added 1 changesets with 1 changes to 1 files (+1 heads) |
258 new changesets 00e3b7781125 |
258 new changesets 00e3b7781125 |
259 rebasing 5:518d153c0ba3 "L1" |
259 rebasing 5:518d153c0ba3 "L1" |
260 saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg (glob) |
260 saved backup bundle to $TESTTMP/c/.hg/strip-backup/518d153c0ba3-73407f14-rebase.hg |
261 $ hg tglog |
261 $ hg tglog |
262 @ 6: 0d0727eb7ce0 'L1' |
262 @ 6: 0d0727eb7ce0 'L1' |
263 | |
263 | |
264 o 5: 00e3b7781125 'R4' |
264 o 5: 00e3b7781125 'R4' |
265 | |
265 | |
300 $ hg ci -Am L2 |
300 $ hg ci -Am L2 |
301 adding L2 |
301 adding L2 |
302 $ hg up 'desc(L1)' |
302 $ hg up 'desc(L1)' |
303 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
303 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
304 $ hg pull --rebase |
304 $ hg pull --rebase |
305 pulling from $TESTTMP/a (glob) |
305 pulling from $TESTTMP/a |
306 searching for changes |
306 searching for changes |
307 adding changesets |
307 adding changesets |
308 adding manifests |
308 adding manifests |
309 adding file changes |
309 adding file changes |
310 added 1 changesets with 1 changes to 1 files (+1 heads) |
310 added 1 changesets with 1 changes to 1 files (+1 heads) |
311 new changesets 88dd24261747 |
311 new changesets 88dd24261747 |
312 rebasing 6:0d0727eb7ce0 "L1" |
312 rebasing 6:0d0727eb7ce0 "L1" |
313 rebasing 7:c1f58876e3bf "L2" |
313 rebasing 7:c1f58876e3bf "L2" |
314 saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg (glob) |
314 saved backup bundle to $TESTTMP/c/.hg/strip-backup/0d0727eb7ce0-ef61ccb2-rebase.hg |
315 $ hg tglog |
315 $ hg tglog |
316 o 8: 6dc0ea5dcf55 'L2' |
316 o 8: 6dc0ea5dcf55 'L2' |
317 | |
317 | |
318 @ 7: 864e0a2d2614 'L1' |
318 @ 7: 864e0a2d2614 'L1' |
319 | |
319 | |
342 adding R6 |
342 adding R6 |
343 $ cd ../c |
343 $ cd ../c |
344 $ hg up 'desc(R5)' |
344 $ hg up 'desc(R5)' |
345 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
345 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
346 $ hg pull --rebase |
346 $ hg pull --rebase |
347 pulling from $TESTTMP/a (glob) |
347 pulling from $TESTTMP/a |
348 searching for changes |
348 searching for changes |
349 adding changesets |
349 adding changesets |
350 adding manifests |
350 adding manifests |
351 adding file changes |
351 adding file changes |
352 added 1 changesets with 1 changes to 1 files (+1 heads) |
352 added 1 changesets with 1 changes to 1 files (+1 heads) |
392 adding B1 |
392 adding B1 |
393 $ cd ../c |
393 $ cd ../c |
394 $ hg up 'desc(L2)' |
394 $ hg up 'desc(L2)' |
395 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
395 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
396 $ hg pull --rebase |
396 $ hg pull --rebase |
397 pulling from $TESTTMP/a (glob) |
397 pulling from $TESTTMP/a |
398 searching for changes |
398 searching for changes |
399 adding changesets |
399 adding changesets |
400 adding manifests |
400 adding manifests |
401 adding file changes |
401 adding file changes |
402 added 1 changesets with 1 changes to 1 files |
402 added 1 changesets with 1 changes to 1 files |
419 adding R7 |
419 adding R7 |
420 $ cd ../c |
420 $ cd ../c |
421 $ hg up 'desc(L2)' |
421 $ hg up 'desc(L2)' |
422 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
422 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
423 $ hg pull --rebase |
423 $ hg pull --rebase |
424 pulling from $TESTTMP/a (glob) |
424 pulling from $TESTTMP/a |
425 searching for changes |
425 searching for changes |
426 adding changesets |
426 adding changesets |
427 adding manifests |
427 adding manifests |
428 adding file changes |
428 adding file changes |
429 added 1 changesets with 1 changes to 1 files (+1 heads) |
429 added 1 changesets with 1 changes to 1 files (+1 heads) |
430 new changesets f7d3e42052f9 |
430 new changesets f7d3e42052f9 |
431 rebasing 7:864e0a2d2614 "L1" |
431 rebasing 7:864e0a2d2614 "L1" |
432 rebasing 8:6dc0ea5dcf55 "L2" |
432 rebasing 8:6dc0ea5dcf55 "L2" |
433 saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg (glob) |
433 saved backup bundle to $TESTTMP/c/.hg/strip-backup/864e0a2d2614-2f72c89c-rebase.hg |
434 $ hg tglog |
434 $ hg tglog |
435 @ 12: 3603a865eea0 'L2' |
435 @ 12: 3603a865eea0 'L2' |
436 | |
436 | |
437 o 11: bcc8a9cd04bf 'L1' |
437 o 11: bcc8a9cd04bf 'L1' |
438 | |
438 | |