Show More
@@ -252,27 +252,29 b' tagging on an uncommitted merge (issue25' | |||||
252 | $ echo c1 > f1 |
|
252 | $ echo c1 > f1 | |
253 | $ hg ci -Am0 |
|
253 | $ hg ci -Am0 | |
254 | adding f1 |
|
254 | adding f1 | |
|
255 | $ echo c2 > f2 | |||
|
256 | $ hg ci -Am1 | |||
|
257 | adding f2 | |||
|
258 | $ hg co -q 0 | |||
255 | $ hg branch b1 |
|
259 | $ hg branch b1 | |
256 | marked working directory as branch b1 |
|
260 | marked working directory as branch b1 | |
257 | $ echo c2 >> f1 |
|
261 | $ hg ci -m2 | |
258 | $ hg ci -m1 |
|
|||
259 | $ hg up default |
|
262 | $ hg up default | |
260 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
263 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
261 | $ hg merge b1 |
|
264 | $ hg merge b1 | |
262 |
|
|
265 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
263 | (branch merge, don't forget to commit) |
|
266 | (branch merge, don't forget to commit) | |
264 |
|
267 | |||
265 | $ hg tag t1 |
|
268 | $ hg tag t1 | |
266 | abort: uncommitted merge |
|
269 | abort: uncommitted merge | |
267 | [255] |
|
270 | [255] | |
268 | $ hg status |
|
271 | $ hg status | |
269 | M f1 |
|
|||
270 | $ hg tag --rev 1 t2 |
|
272 | $ hg tag --rev 1 t2 | |
271 | abort: uncommitted merge |
|
273 | abort: uncommitted merge | |
272 | [255] |
|
274 | [255] | |
273 | $ hg tag --rev 1 --local t3 |
|
275 | $ hg tag --rev 1 --local t3 | |
274 | $ hg tags -v |
|
276 | $ hg tags -v | |
275 |
tip |
|
277 | tip 2:8a8f787d0d5c | |
276 |
t3 1: |
|
278 | t3 1:c3adabd1a5f4 local | |
277 |
|
279 | |||
278 | $ cd .. |
|
280 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now