开发者

With Mercurial, if there are two local clones, can you push from one branch to another branch?

开发者 https://www.devze.com 2023-01-23 14:00 出处:网络
If there are two branches, and I have been doing work on the default branch, I think one way to push to the foo bran开发者_Go百科ch of the other clone is

If there are two branches, and I have been doing work on the default branch, I think one way to push to the foo bran开发者_Go百科ch of the other clone is

cd ~/development/clone2
hg up default
hg pull ~/developmet/clone1
hg up foo
hg merge default

or

cd ~/development/clone1
hg up default
hg push ~/developmet/clone2
cd ~/development/clone2
hg up foo
hg merge default

These 2 methods work exactly the same? (one is a pull, one is a push).

Is there an easier way to directly push clone1's default branch to clone2's foo branch? thanks.

(I use clone 1 to see all the changes I have done (without seeing anybody else's changes), and use clone2 to merge and integrate with other team members)


You can always push and pull a single revision and all of it ancestors using:

hg push -r revision ~/development/clone1

or

hg pull -r revision ~/development/clone2


There's no way to "push to another branch" because you'll always have to merge the two different branches manually

Both methods you described work exactly the same, but the first one is recommended (Always do the merge work in your clone, not the integration repository or somebody else's clone)

Maybe is an intentional omission but in both examples you have to commit the result of the merge and in the first example you have to push the merge changeset back to clone2

So in ~/development/clone1 do:

hg up default
hg pull -u ~/development/clone2
hg up foo
hg merge default 
hg ci -m 'merged default into foo'
hg push ~/development/clone2

If you do this a lot you may consider adding this lines to your ~/development/clone1/.hg/hgrc file

[paths]
default = ~/development/clone2

This way you can omit the repository path when you're pulling and pushing from the integration repository

0

精彩评论

暂无评论...
验证码 换一张
取 消