내기! 여기에 짧은 대답입니다 :
Mode LastWriteTime Length Name
---- ------------- ------ ----
d---- 3/24/2011 7:35 AM .hg
-a--- 3/24/2011 7:33 AM 89 file2.txt
우리는 다른 저장소를 생성 할 수 있습니다 : 여기
Mode LastWriteTime Length Name
---- ------------- ------ ----
d---- 3/24/2011 7:33 AM .hg
-a--- 3/24/2011 7:33 AM 85 file1.txt
은 R2의 :
https://www.mercurial-scm.org/wiki/MergingUnrelatedRepositories
하는의 여기 (R1)가있어 두 개의 저장소
Mode LastWriteTime Length Name
---- ------------- ------ ----
d---- 3/24/2011 7:33 AM r1
d---- 3/24/2011 7:35 AM r2
있다고 가정 해 봅시다 "r1"을 복제하여 "병합"이라고합니다.
$>hg clone r1 merged
updating to branch default
resolving manifests
getting file1.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$>cd merged
이제 우리는에 "R2"를 당겨해야합니다
$>hg merge
resolving manifests
getting file2.txt
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$>hg commit -m "Merged two both repos"
file2.txt
committed changeset 4:40028ef336d9
모든 수행 :
$>hg pull -f ..\r2
pulling from ..\r2
searching for changes
warning: repository is unrelated
2 changesets found
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
마지막으로, 우리가 함께 병합하고 변경 사항을 커밋해야합니다! 여기에 우리의 병합의 repo는 다음과 같습니다
Mode LastWriteTime Length Name
---- ------------- ------ ----
d---- 3/24/2011 7:36 AM .hg
-a--- 3/24/2011 7:36 AM 85 file1.txt
-a--- 3/24/2011 7:36 AM 89 file2.txt
이의 우리 역사에있어 무엇 보자 ...
$>hg log
changeset: 4:40028ef336d9
tag: tip
parent: 1:464b7426220c
parent: 3:3b5eba6d03ef
user: Joe Schmoe <[email protected]>
date: Thu Mar 24 07:36:58 2011 -0700
description:
Merged two both repos
changeset: 3:3b5eba6d03ef
user: Joe Schmoe <[email protected]>
date: Thu Mar 24 07:35:02 2011 -0700
files: file2.txt
description:
Added second line to second file
changeset: 2:c26449adfb4d
parent: -1:000000000000
user: Joe Schmoe <[email protected]>
date: Thu Mar 24 07:32:52 2011 -0700
files: file2.txt
description:
Added first line of second file
changeset: 1:464b7426220c
user: Joe Schmoe <[email protected]>
date: Thu Mar 24 07:33:47 2011 -0700
files: file1.txt
description:
Added second line to first file
changeset: 0:51cb60e8a68a
user: Joe Schmoe <[email protected]>
date: Thu Mar 24 07:31:59 2011 -0700
files: file1.txt
description:
Added first line to first file
성공!
안녕하세요. 오빠가 업보트를 얻을 수 있습니까? –
물론 할 수 있습니다! 그걸 입력 해 주셔서 감사합니다! 나는 이것을 시도한 후에도 확인 표시를 할 것입니다. – leeand00