equal
deleted
inserted
replaced
1 $ cat >> $HGRCPATH <<EOF |
1 $ cat >> $HGRCPATH <<EOF |
2 > [extensions] |
2 > [extensions] |
3 > rebase= |
3 > rebase= |
|
4 > histedit= |
4 > |
5 > |
5 > [alias] |
6 > [alias] |
6 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
7 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
7 > EOF |
8 > EOF |
8 |
9 |
70 $ hg pull --rebase |
71 $ hg pull --rebase |
71 pulling from $TESTTMP/a (glob) |
72 pulling from $TESTTMP/a (glob) |
72 searching for changes |
73 searching for changes |
73 no changes found |
74 no changes found |
74 |
75 |
|
76 Abort pull early if working dir is not clean: |
|
77 |
|
78 $ echo L1-mod > L1 |
|
79 $ hg pull --rebase |
|
80 abort: uncommitted changes |
|
81 [255] |
|
82 $ hg update --clean --quiet |
|
83 |
|
84 Abort pull early if another operation (histedit) is in progress: |
|
85 |
|
86 $ hg histedit . -q --commands - << EOF |
|
87 > edit d80cc2da061e histedit: generate unfinished state |
|
88 > EOF |
|
89 Editing (d80cc2da061e), you may commit or record as needed now. |
|
90 (hg histedit --continue to resume) |
|
91 [1] |
|
92 $ hg pull --rebase |
|
93 abort: histedit in progress |
|
94 (use 'hg histedit --continue' or 'hg histedit --abort') |
|
95 [255] |
|
96 $ hg histedit --abort --quiet |
75 |
97 |
76 Invoke pull --rebase and nothing to rebase: |
98 Invoke pull --rebase and nothing to rebase: |
77 |
99 |
78 $ cd ../c |
100 $ cd ../c |
79 |
101 |