equal
deleted
inserted
replaced
110 0 - 1f0dee641bb7 add a (public) |
110 0 - 1f0dee641bb7 add a (public) |
111 |
111 |
112 test kill and immutable changeset |
112 test kill and immutable changeset |
113 |
113 |
114 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
114 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
115 1 public stable |
115 1 public |
116 $ hg prune 1 |
116 $ hg prune 1 |
117 abort: cannot prune immutable changeset: 7c3bad9141dc |
117 abort: cannot prune immutable changeset: 7c3bad9141dc |
118 (see "hg help phases" for details) |
118 (see "hg help phases" for details) |
119 [255] |
119 [255] |
120 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
120 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
121 1 public stable |
121 1 public |
122 |
122 |
123 test simple kill |
123 test simple kill |
124 |
124 |
125 $ hg id -n |
125 $ hg id -n |
126 5 |
126 5 |
596 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
596 warning: conflicts while merging 1! (edit, then use 'hg resolve --mark') |
597 abort: unresolved conflicts, can't continue |
597 abort: unresolved conflicts, can't continue |
598 (use 'hg resolve' and 'hg graft --continue') |
598 (use 'hg resolve' and 'hg graft --continue') |
599 [255] |
599 [255] |
600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
600 $ hg log -r7 --template '{rev}:{node|short} {obsolete}\n' |
601 7:a5bfd90a2f29 stable |
601 7:a5bfd90a2f29 |
602 $ echo 3 > 1 |
602 $ echo 3 > 1 |
603 $ hg resolve -m 1 |
603 $ hg resolve -m 1 |
604 (no more unresolved files) |
604 (no more unresolved files) |
605 continue: hg graft --continue |
605 continue: hg graft --continue |
606 $ hg graft --continue -O |
606 $ hg graft --continue -O |
1124 serve start stand-alone webserver |
1124 serve start stand-alone webserver |
1125 status show changed files in the working directory |
1125 status show changed files in the working directory |
1126 summary summarize working directory state |
1126 summary summarize working directory state |
1127 update update working directory (or switch revisions) |
1127 update update working directory (or switch revisions) |
1128 |
1128 |
1129 (use "hg help" for the full list of commands or "hg -v" for details) |
1129 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1130 [255] |
1130 [255] |
1131 $ hg fold |
1131 $ hg fold |
1132 hg: unknown command 'fold' |
1132 hg: unknown command 'fold' |
1133 Mercurial Distributed SCM |
1133 Mercurial Distributed SCM |
1134 |
1134 |
1150 serve start stand-alone webserver |
1150 serve start stand-alone webserver |
1151 status show changed files in the working directory |
1151 status show changed files in the working directory |
1152 summary summarize working directory state |
1152 summary summarize working directory state |
1153 update update working directory (or switch revisions) |
1153 update update working directory (or switch revisions) |
1154 |
1154 |
1155 (use "hg help" for the full list of commands or "hg -v" for details) |
1155 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1156 [255] |
1156 [255] |
1157 Enabling commands selectively, only fold enabled, next is still unknown |
1157 Enabling commands selectively, only fold enabled, next is still unknown |
1158 $ cat >> $HGRCPATH <<EOF |
1158 $ cat >> $HGRCPATH <<EOF |
1159 > [experimental] |
1159 > [experimental] |
1160 > evolution=createmarkers |
1160 > evolution=createmarkers |
1186 serve start stand-alone webserver |
1186 serve start stand-alone webserver |
1187 status show changed files in the working directory |
1187 status show changed files in the working directory |
1188 summary summarize working directory state |
1188 summary summarize working directory state |
1189 update update working directory (or switch revisions) |
1189 update update working directory (or switch revisions) |
1190 |
1190 |
1191 (use "hg help" for the full list of commands or "hg -v" for details) |
1191 (use 'hg help' for the full list of commands or 'hg -v' for details) |
1192 [255] |
1192 [255] |
1193 |
1193 |
1194 Restore all of the evolution features |
1194 Restore all of the evolution features |
1195 |
1195 |
1196 $ cat >> $HGRCPATH <<EOF |
1196 $ cat >> $HGRCPATH <<EOF |