equal
deleted
inserted
replaced
5 $ cat <<EOF >> .hg/hgrc |
5 $ cat <<EOF >> .hg/hgrc |
6 > [extensions] |
6 > [extensions] |
7 > rebase= |
7 > rebase= |
8 > [phases] |
8 > [phases] |
9 > publish=false |
9 > publish=false |
|
10 > EOF |
|
11 $ cat <<EOF >> $HGRCPATH |
10 > [ui] |
12 > [ui] |
11 > logtemplate = '{rev} ({topics}) {desc}\n' |
13 > logtemplate = '{rev} ({topics}) {desc}\n' |
12 > EOF |
14 > EOF |
13 |
15 |
14 $ for x in alpha beta gamma delta ; do |
16 $ for x in alpha beta gamma delta ; do |
254 o 1 () c_beta |
256 o 1 () c_beta |
255 | |
257 | |
256 o 0 () c_alpha |
258 o 0 () c_alpha |
257 |
259 |
258 |
260 |
|
261 |
|
262 Check pull --rebase |
|
263 ------------------- |
|
264 |
|
265 (we broke it a some point) |
|
266 |
|
267 $ cd .. |
|
268 $ hg clone jungle other --rev '2' |
|
269 adding changesets |
|
270 adding manifests |
|
271 adding file changes |
|
272 added 3 changesets with 3 changes to 3 files |
|
273 updating to branch default |
|
274 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
275 $ cd other |
|
276 $ echo other > other |
|
277 $ hg add other |
|
278 $ hg ci -m 'c_other' |
|
279 $ hg pull -r default --rebase |
|
280 pulling from $TESTTMP/jungle |
|
281 searching for changes |
|
282 adding changesets |
|
283 adding manifests |
|
284 adding file changes |
|
285 added 3 changesets with 3 changes to 3 files (+1 heads) |
|
286 rebasing 3:dbc48dd9e743 "c_other" |
|
287 $ hg log -G |
|
288 @ 7 () c_other |
|
289 | |
|
290 o 6 () c_zeta |
|
291 | |
|
292 o 5 () c_epsilon |
|
293 | |
|
294 o 4 () c_delta |
|
295 | |
|
296 o 2 () c_gamma |
|
297 | |
|
298 o 1 () c_beta |
|
299 | |
|
300 o 0 () c_alpha |
|
301 |
|
302 $ cd ../jungle |
|
303 |
|
304 |
259 Default destination for update |
305 Default destination for update |
260 =============================== |
306 =============================== |
261 |
307 |
262 initial setup |
308 initial setup |
263 |
309 |