##// END OF EJS Templates
test-histedit: fix instability creation test...
Pierre-Yves David -
r18438:81e77a88 default
parent child Browse files
Show More
@@ -14,6 +14,7 b' Enable obsolete'
14 > publish=False
14 > publish=False
15 > [extensions]'
15 > [extensions]'
16 > histedit=
16 > histedit=
17 > rebase=
17 >
18 >
18 > obs=${TESTTMP}/obs.py
19 > obs=${TESTTMP}/obs.py
19 > EOF
20 > EOF
@@ -148,8 +149,25 b' Test that rewriting leaving instability '
148
149
149 $ hg up '.^'
150 $ hg up '.^'
150 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
151 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
151 $ hg phase --force --draft .
152 $ hg ph --force --draft '.'
152 $ hg log -r 'children(.)'
153 $ hg log -r 'children(.)'
153 9:c13eb81022ca f (no-eol)
154 9:c13eb81022ca f (no-eol)
154 $ hg histedit -r '.'
155 $ cat > commands.txt <<EOF
156 > edit b346ab9a313d 6 c
157 > EOF
158 $ hg histedit -r '.' --commands commands.txt
159 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
160 adding c
161 abort: Make changes as needed, you may commit or record as needed now.
162 When you are finished, run hg histedit --continue to resume.
163 [255]
164 $ echo c >> c
165 $ hg histedit --continue
155 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
166 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
167
168 $ hg log -r 'unstable()'
169 9:c13eb81022ca f (no-eol)
170
171 stabilise
172
173 $ hg rebase -r 'unstable()' -d .
General Comments 0
You need to be logged in to leave comments. Login now