Show More
@@ -123,4 +123,36 b' manifest after edit' | |||||
123 | e |
|
123 | e | |
124 | f |
|
124 | f | |
125 |
|
125 | |||
|
126 | Drop the last changeset | |||
|
127 | ||||
|
128 | $ cat > $EDITED <<EOF | |||
|
129 | > pick ee283cb5f2d5 e | |||
|
130 | > pick a4f7421b80f7 f | |||
|
131 | > drop f518305ce889 d | |||
|
132 | > EOF | |||
|
133 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit ee283cb5f2d5 2>&1 | fixbundle | |||
|
134 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
135 | $ hg log --graph | |||
|
136 | @ changeset: 3:a4f7421b80f7 | |||
|
137 | | tag: tip | |||
|
138 | | user: test | |||
|
139 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
140 | | summary: f | |||
|
141 | | | |||
|
142 | o changeset: 2:ee283cb5f2d5 | |||
|
143 | | user: test | |||
|
144 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
145 | | summary: e | |||
|
146 | | | |||
|
147 | o changeset: 1:d2ae7f538514 | |||
|
148 | | user: test | |||
|
149 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
150 | | summary: b | |||
|
151 | | | |||
|
152 | o changeset: 0:cb9a9f314b8b | |||
|
153 | user: test | |||
|
154 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
155 | summary: a | |||
|
156 | ||||
|
157 | ||||
126 | $ cd .. |
|
158 | $ cd .. |
@@ -153,6 +153,56 b' stabilise' | |||||
153 |
|
153 | |||
154 | $ hg rebase -r 'unstable()' -d . |
|
154 | $ hg rebase -r 'unstable()' -d . | |
155 |
|
155 | |||
|
156 | Test dropping of changeset on the top of the stack | |||
|
157 | ------------------------------------------------------- | |||
|
158 | ||||
|
159 | Nothing is rewritten below, the working directory parent must be change for the | |||
|
160 | dropped changeset to be hidden. | |||
|
161 | ||||
|
162 | $ cd .. | |||
|
163 | $ hg clone base droplast | |||
|
164 | updating to branch default | |||
|
165 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
166 | $ cd droplast | |||
|
167 | $ cat > commands.txt <<EOF | |||
|
168 | > pick 40db8afa467b 10 c | |||
|
169 | > drop b449568bf7fc 11 f | |||
|
170 | > EOF | |||
|
171 | $ hg histedit -r '40db8afa467b' --commands commands.txt | |||
|
172 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
173 | $ hg log -G | |||
|
174 | @ 10:40db8afa467b c | |||
|
175 | | | |||
|
176 | o 0:cb9a9f314b8b a | |||
|
177 | ||||
|
178 | ||||
|
179 | With rewritten ancestors | |||
|
180 | ||||
|
181 | $ echo e > e | |||
|
182 | $ hg add e | |||
|
183 | $ hg commit -m g | |||
|
184 | $ echo f > f | |||
|
185 | $ hg add f | |||
|
186 | $ hg commit -m h | |||
|
187 | $ cat > commands.txt <<EOF | |||
|
188 | > pick 47a8561c0449 12 g | |||
|
189 | > pick 40db8afa467b 10 c | |||
|
190 | > drop 1b3b05f35ff0 13 h | |||
|
191 | > EOF | |||
|
192 | $ hg histedit -r '40db8afa467b' --commands commands.txt | |||
|
193 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |||
|
194 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
195 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
196 | $ hg log -G | |||
|
197 | @ 15:ee6544123ab8 c | |||
|
198 | | | |||
|
199 | o 14:269e713e9eae g | |||
|
200 | | | |||
|
201 | o 0:cb9a9f314b8b a | |||
|
202 | ||||
|
203 | $ cd ../base | |||
|
204 | ||||
|
205 | ||||
156 |
|
206 | |||
157 | Test phases support |
|
207 | Test phases support | |
158 | =========================================== |
|
208 | =========================================== |
General Comments 0
You need to be logged in to leave comments.
Login now