377 Test commit -o options |
377 Test commit -o options |
378 |
378 |
379 $ hg up -r "desc('a nifty feature')" |
379 $ hg up -r "desc('a nifty feature')" |
380 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
380 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
381 $ hg revert -r "desc('another feature')" --all |
381 $ hg revert -r "desc('another feature')" --all |
|
382 adding file-from-B |
382 reverting main-file-1 |
383 reverting main-file-1 |
383 adding file-from-B |
|
384 $ sed -i'' -e s/Zwei/deux/ main-file-1 |
384 $ sed -i'' -e s/Zwei/deux/ main-file-1 |
385 $ hg commit -m 'another feature that rox' -o 5 |
385 $ hg commit -m 'another feature that rox' -o 5 |
386 created new head |
386 created new head |
387 $ hg log |
387 $ hg log |
388 6 feature-B: another feature that rox - test |
388 6 feature-B: another feature that rox - test |
536 $ hg verify |
536 $ hg verify |
537 checking changesets |
537 checking changesets |
538 checking manifests |
538 checking manifests |
539 crosschecking files in changesets and manifests |
539 crosschecking files in changesets and manifests |
540 checking files |
540 checking files |
541 checked 3 changesets with 3 changes to 3 files |
541 3 files, 3 changesets, 3 total revisions |
542 $ hg --config extensions.hgext.mq= strip 'extinct()' |
542 $ hg --config extensions.hgext.mq= strip 'extinct()' |
543 abort: empty revision set |
543 abort: empty revision set |
544 [255] |
544 [255] |
545 (do some garbare collection) |
545 (do some garbare collection) |
546 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' --config devel.strip-obsmarkers=no |
546 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' --config devel.strip-obsmarkers=no |
562 adding changesets |
562 adding changesets |
563 adding manifests |
563 adding manifests |
564 adding file changes |
564 adding file changes |
565 added 1 changesets with 1 changes to 1 files |
565 added 1 changesets with 1 changes to 1 files |
566 1 new obsolescence markers |
566 1 new obsolescence markers |
567 new changesets c6dda801837c (1 drafts) |
567 new changesets c6dda801837c |
568 (run 'hg update' to get a working copy) |
568 (run 'hg update' to get a working copy) |
569 $ hg up |
569 $ hg up |
570 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
570 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
571 |
571 |
572 $ cd .. |
572 $ cd .. |
1158 > [experimental] |
1158 > [experimental] |
1159 > evolution=createmarkers |
1159 > evolution=createmarkers |
1160 > EOF |
1160 > EOF |
1161 $ hg next |
1161 $ hg next |
1162 hg: unknown command 'next' |
1162 hg: unknown command 'next' |
1163 (use 'hg help' for a list of commands) |
1163 Mercurial Distributed SCM |
|
1164 |
|
1165 basic commands: |
|
1166 |
|
1167 add add the specified files on the next commit |
|
1168 annotate show changeset information by line for each file |
|
1169 clone make a copy of an existing repository |
|
1170 commit commit the specified files or all outstanding changes |
|
1171 diff diff repository (or selected files) |
|
1172 export dump the header and diffs for one or more changesets |
|
1173 forget forget the specified files on the next commit |
|
1174 init create a new repository in the given directory |
|
1175 log show revision history of entire repository or files |
|
1176 merge merge another revision into working directory |
|
1177 pull pull changes from the specified source |
|
1178 push push changes to the specified destination |
|
1179 remove remove the specified files on the next commit |
|
1180 serve start stand-alone webserver |
|
1181 status show changed files in the working directory |
|
1182 summary summarize working directory state |
|
1183 update update working directory (or switch revisions) |
|
1184 |
|
1185 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1164 [255] |
1186 [255] |
1165 $ hg fold |
1187 $ hg fold |
1166 hg: unknown command 'fold' |
1188 hg: unknown command 'fold' |
1167 (use 'hg help' for a list of commands) |
1189 Mercurial Distributed SCM |
|
1190 |
|
1191 basic commands: |
|
1192 |
|
1193 add add the specified files on the next commit |
|
1194 annotate show changeset information by line for each file |
|
1195 clone make a copy of an existing repository |
|
1196 commit commit the specified files or all outstanding changes |
|
1197 diff diff repository (or selected files) |
|
1198 export dump the header and diffs for one or more changesets |
|
1199 forget forget the specified files on the next commit |
|
1200 init create a new repository in the given directory |
|
1201 log show revision history of entire repository or files |
|
1202 merge merge another revision into working directory |
|
1203 pull pull changes from the specified source |
|
1204 push push changes to the specified destination |
|
1205 remove remove the specified files on the next commit |
|
1206 serve start stand-alone webserver |
|
1207 status show changed files in the working directory |
|
1208 summary summarize working directory state |
|
1209 update update working directory (or switch revisions) |
|
1210 |
|
1211 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1168 [255] |
1212 [255] |
1169 Enabling commands selectively, only fold enabled, next is still unknown |
1213 Enabling commands selectively, only fold enabled, next is still unknown |
1170 $ cat >> $HGRCPATH <<EOF |
1214 $ cat >> $HGRCPATH <<EOF |
1171 > [experimental] |
1215 > [experimental] |
1172 > evolution=createmarkers |
1216 > evolution=createmarkers |
1175 $ hg fold |
1219 $ hg fold |
1176 abort: no revisions specified |
1220 abort: no revisions specified |
1177 [255] |
1221 [255] |
1178 $ hg next |
1222 $ hg next |
1179 hg: unknown command 'next' |
1223 hg: unknown command 'next' |
1180 (use 'hg help' for a list of commands) |
1224 Mercurial Distributed SCM |
|
1225 |
|
1226 basic commands: |
|
1227 |
|
1228 add add the specified files on the next commit |
|
1229 annotate show changeset information by line for each file |
|
1230 clone make a copy of an existing repository |
|
1231 commit commit the specified files or all outstanding changes |
|
1232 diff diff repository (or selected files) |
|
1233 export dump the header and diffs for one or more changesets |
|
1234 fold fold multiple revisions into a single one |
|
1235 forget forget the specified files on the next commit |
|
1236 init create a new repository in the given directory |
|
1237 log show revision history of entire repository or files |
|
1238 merge merge another revision into working directory |
|
1239 pull pull changes from the specified source |
|
1240 push push changes to the specified destination |
|
1241 remove remove the specified files on the next commit |
|
1242 serve start stand-alone webserver |
|
1243 status show changed files in the working directory |
|
1244 summary summarize working directory state |
|
1245 update update working directory (or switch revisions) |
|
1246 |
|
1247 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1181 [255] |
1248 [255] |
1182 |
1249 |
1183 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
1250 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled |
1184 |
1251 |
1185 $ hg --hidden up 14 |
1252 $ hg --hidden up 14 |