equal
deleted
inserted
replaced
110 |
110 |
111 test kill and immutable changeset |
111 test kill and immutable changeset |
112 |
112 |
113 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
113 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
114 1 public stable |
114 1 public stable |
115 $ hg kill 1 |
115 $ hg prune 1 |
116 abort: cannot prune immutable changeset: 7c3bad9141dc |
116 abort: cannot prune immutable changeset: 7c3bad9141dc |
117 (see "hg help phases" for details) |
117 (see "hg help phases" for details) |
118 [255] |
118 [255] |
119 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
119 $ hg log -r 1 --template '{rev} {phase} {obsolete}\n' |
120 1 public stable |
120 1 public stable |
121 |
121 |
122 test simple kill |
122 test simple kill |
123 |
123 |
124 $ hg id -n |
124 $ hg id -n |
125 5 |
125 5 |
126 $ hg kill . |
126 $ hg prune . |
127 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
127 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
128 working directory now at fbb94e3a0ecf |
128 working directory now at fbb94e3a0ecf |
129 1 changesets pruned |
129 1 changesets pruned |
130 $ hg qlog |
130 $ hg qlog |
131 4 - fbb94e3a0ecf add e (draft) |
131 4 - fbb94e3a0ecf add e (draft) |
134 1 - 7c3bad9141dc add b (public) |
134 1 - 7c3bad9141dc add b (public) |
135 0 - 1f0dee641bb7 add a (public) |
135 0 - 1f0dee641bb7 add a (public) |
136 |
136 |
137 test multiple kill |
137 test multiple kill |
138 |
138 |
139 $ hg kill 4 -r 3 |
139 $ hg prune 4 -r 3 |
140 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
140 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
141 working directory now at 7c3bad9141dc |
141 working directory now at 7c3bad9141dc |
142 2 changesets pruned |
142 2 changesets pruned |
143 $ hg qlog |
143 $ hg qlog |
144 2 - 4538525df7e2 add c (draft) |
144 2 - 4538525df7e2 add c (draft) |
149 |
149 |
150 $ hg up 2 |
150 $ hg up 2 |
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 $ echo 4 > g |
152 $ echo 4 > g |
153 $ hg add g |
153 $ hg add g |
154 $ hg kill . |
154 $ hg prune . |
155 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
155 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
156 working directory now at 7c3bad9141dc |
156 working directory now at 7c3bad9141dc |
157 1 changesets pruned |
157 1 changesets pruned |
158 $ hg st |
158 $ hg st |
159 A g |
159 A g |
788 $ echo b > b |
788 $ echo b > b |
789 $ hg ci -Am b |
789 $ hg ci -Am b |
790 adding b |
790 adding b |
791 $ hg mv a c |
791 $ hg mv a c |
792 $ hg ci -m c |
792 $ hg ci -m c |
793 $ hg kill .^ |
793 $ hg prune .^ |
794 1 changesets pruned |
794 1 changesets pruned |
795 1 new unstable changesets |
795 1 new unstable changesets |
796 $ hg stab --any |
796 $ hg stab --any |
797 move:[15] c |
797 move:[15] c |
798 atop:[13] a |
798 atop:[13] a |