equal
deleted
inserted
replaced
195 |
195 |
196 $ hg update -q B |
196 $ hg update -q B |
197 $ echo 2 >> B |
197 $ echo 2 >> B |
198 $ hg amend |
198 $ hg amend |
199 abort: cannot amend changeset with children |
199 abort: cannot amend changeset with children |
200 [255] |
200 [10] |
201 |
201 |
202 #if obsstore-on |
202 #if obsstore-on |
203 |
203 |
204 With allowunstable, amend could work in the middle of a stack |
204 With allowunstable, amend could work in the middle of a stack |
205 |
205 |
238 $ hg phase -r A --public |
238 $ hg phase -r A --public |
239 $ hg update -C -q A |
239 $ hg update -C -q A |
240 $ hg amend -m AMEND |
240 $ hg amend -m AMEND |
241 abort: cannot amend public changesets |
241 abort: cannot amend public changesets |
242 (see 'hg help phases' for details) |
242 (see 'hg help phases' for details) |
243 [255] |
243 [10] |
244 |
244 |
245 Amend a merge changeset |
245 Amend a merge changeset |
246 |
246 |
247 $ hg init $TESTTMP/repo3 |
247 $ hg init $TESTTMP/repo3 |
248 $ cd $TESTTMP/repo3 |
248 $ cd $TESTTMP/repo3 |