##// END OF EJS Templates
histedit: don't swallow errors that happen when updating the working copy...
Martin von Zweigbergk -
r48228:e9fbf8fd default
parent child Browse files
Show More
@@ -575,7 +575,7 b' class histeditaction(object):'
575 575 parentctx, but does not commit them."""
576 576 repo = self.repo
577 577 rulectx = repo[self.node]
578 repo.ui.pushbuffer(error=True)
578 repo.ui.pushbuffer()
579 579 hg.update(repo, self.state.parentctxnode, quietempty=True)
580 580 repo.ui.popbuffer()
581 581 stats = applychanges(repo.ui, repo, rulectx, {})
@@ -117,18 +117,9 b' directory (reordering nodes):'
117 117 > EOF
118 118 $ cd $TESTTMP/hghistedit/somedir
119 119 $ hg --config extensions.histedit= histedit -q --commands ../histedit_commands
120 current directory was removed
121 (consider changing to repo root: $TESTTMP/hghistedit)
120 122
121 histedit doesn't output anything when the current diretory is removed. We rely
122 on the tests being commonly run on machines where the current directory
123 disappearing from underneath us actually has an observable effect, such as an
124 error or no files listed
125 #if linuxormacos
126 $ isfile foo
127 no
128 #endif
129 $ cd $TESTTMP/hghistedit/somedir
130 $ isfile foo
131 yes
132 123
133 124 $ cd $TESTTMP/hghistedit
134 125 $ cat > histedit_commands <<EOF
@@ -181,6 +172,8 b" Histedit doing 'pick, pick, fold':"
181 172 > pick ff70a87b588f 0 add foo
182 173 > fold 9992bb0ac0db 2 add baz
183 174 > EOF
175 current directory was removed
176 (consider changing to repo root: $TESTTMP/issue5826_withrm)
184 177 abort: $ENOENT$
185 178 [255]
186 179
General Comments 0
You need to be logged in to leave comments. Login now