我想补充说明和举例
- 汞考勤记录是你最好的朋友才能看到的版本树,找到目标汞柱高达
汞出入记录(部分)从我的回购与2条活性并联支路和合并分支从TortoiseHG
上截图在过程
o changeset: 62:eed6619dadb8
| branch: Cleanup
| tag: tip
| parent: 59:c9e3b41ec78f
| user: Alex Bream <...>
| date: Thu Mar 03 19:19:34 2011 +0500
| summary: Зачистка по 1-1 131
|
| @ changeset: 61:e7ae9e5f725a
| | user: Alex Bream <...>
| | date: Thu Mar 03 05:40:34 2011 +0500
| | summary: 2-9 по 2745
| |
| o changeset: 60:1393fe759096
|/| parent: 57:a38258cac9b8
| | parent: 59:c9e3b41ec78f
| | user: Alexander <...>
| | date: Thu Mar 03 04:59:22 2011 +0500
| | summary: Merge с чистилкой
| |
o | changeset: 59:c9e3b41ec78f
| | branch: Cleanup
| | user: Alexander <...>
| | date: Thu Mar 03 04:54:11 2011 +0500
| | summary: Зачистка пролог полностью
| |
o | changeset: 58:f7f288c9e72b
| | branch: Cleanup
| | parent: 55:acadd1e83fba
| | user: Alexander <...>
| | date: Thu Mar 03 04:50:11 2011 +0500
| | summary: Зачистка по 47
| |
| o changeset: 57:a38258cac9b8
| | user: Alexander <...>
| | date: Thu Mar 03 04:37:49 2011 +0500
| | summary: 2-9 по 2737
| |
| o changeset: 56:c838826fadb8
|/ user: Alexander <...>
| date: Thu Mar 03 04:27:40 2011 +0500
| summary: 2-9 по 2692
|
o changeset: 55:acadd1e83fba
| user: Alex Bream <...>
| date: Wed Mar 02 00:39:27 2011 +0500
| summary: 2-9 по 2640
|
相同部分
你的意思是我做20个合并与躯干(最后变更#5)我所有的20个分支机构,然后继续从变更#5后备箱这是合并前的工作?如果是的话,如果我将这样的主干合并到同一个分支几次,这会是问题吗? –
@MaxGrigoriev:是的。您可以根据需要经常合并分支。只要确保合并时您在正确的分支上。 –
我总是可以回到正确的变化:) –