equal
deleted
inserted
replaced
119 add new commit to be amended |
119 add new commit to be amended |
120 |
120 |
121 $ echo a >> a |
121 $ echo a >> a |
122 $ hg ci -m3 |
122 $ hg ci -m3 |
123 |
123 |
|
124 $ echo 't = t' > .hgsub |
|
125 |
|
126 --interactive won't silently ignore dirty subrepos |
|
127 |
|
128 $ echo modified > t/b |
|
129 $ hg amend --interactive --config ui.interactive=True |
|
130 abort: uncommitted changes in subrepository "t" |
|
131 [255] |
|
132 $ hg amend --interactive --config ui.interactive=True --config ui.commitsubrepos=True |
|
133 abort: uncommitted changes in subrepository "t" |
|
134 [255] |
|
135 |
|
136 $ hg -R t revert -q --all --no-backup |
|
137 |
124 amend with one subrepo dropped |
138 amend with one subrepo dropped |
125 |
139 |
126 $ echo 't = t' > .hgsub |
|
127 $ hg amend |
140 $ hg amend |
128 saved backup bundle to * (glob) (obsstore-off !) |
141 saved backup bundle to * (glob) (obsstore-off !) |
129 $ hg status --change . |
142 $ hg status --change . |
130 M .hgsub |
143 M .hgsub |
131 M .hgsubstate |
144 M .hgsubstate |