Moving changes from one branch to another without merging

Question

I only understand that I do not understand how to work with such a situation:

I have a trunk and a new branch. I work with this thread, but I also need to change something in the trunk. I switch to the trunk, make changes, commit, click. Everything is fine, but if I want to add all the changes from the trunk to my branch, and I need the trunk and branch to exist separately. Since I am not finishing the branch, but at that time I want new changes from the branch to be integrated into my branch. If I merge, I will have only one trunk or only one branch. And in real life I will have 10-30 different branches that need to be synchronized with the chest. And each branch can be created at different times using different sets of changes.

Is there an easy way?

Answer 1

• hg glog - , hg.

hg glog ()

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
|

TortoiseHG

Answer 2

Er, , - . , ( , , ) - / . - , .