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