plasticscm | 易学教程

Repetitive merges in GIT. How does it calculate differences?

阅读更多关于 Repetitive merges in GIT. How does it calculate differences?

问题 I've been doing a research of trying to understand how does the GIT merge works. I know there are several merge types as recursive, octopus, etc. I figured out that the resolve / recursive is used the most commonly. And that recursive merge is only useful when there are several common ancestors / bases. However, I couldn't find which algorithm is used (or how the ancestor should be calculated) with repetitive merges to the master from the branch. A simple example. Let's create an empty

Repetitive merges in GIT. How does it calculate differences?

阅读更多关于 Repetitive merges in GIT. How does it calculate differences?

git fast-export format and spaces

阅读更多关于 git fast-export format and spaces

问题 I'm writing a fast-export/fast-import for Plastic SCM but I'm having issues dealing with directories and files containing spaces in their names. For instance, a git fast-export of something like: git mv "new directory" "second directory" ends up being exported as: D new directory/hello.c M 100644 :1 second directory/hello.c Instead of a " move " (R) operation. Same happens with a file with spaces in the name. Is there a way to handle it correctly? Does it mean that Git can't handle renames on

Can't start using git repo in plasticscm

阅读更多关于 Can't start using git repo in plasticscm

问题 After installing new plasticscm from the download page on Windows 10, choosing default or creating new repo, going to the Branch Explorer, I can't use "Sync with Git..." feature, it tells me "The user appears as an inactive user because his/her license has been deactivated. Please, activate it and then try again". First I don't get, why the license is deactivated by default, but I followed instructions from https://www.plasticscm.com/documentation/technical-articles/user-license-is

Why does Plastic SCM keep asking if I trust the replication server's certificate?

阅读更多关于 Why does Plastic SCM keep asking if I trust the replication server's certificate?

问题 I started getting the following prompt each time I run a command like cm status : cs:630@rep:MyServer@repserver:ssl://<obfuscated>:8088 WARNING: the secure connection hostname provided in the server certificate doesn't match the server's hostname. This means that the certificate was not issued to this hostname or that there is a network configuration problem with this host. - Certificate hostname: CN=ip-<obfuscated> - Server hostname: CN=<obfuscated> If you want to continue connecting to this

dvcs partial merge (git, hg merge tracking)

阅读更多关于 dvcs partial merge (git, hg merge tracking)

问题 I've one question about general DVCS, including Git and Hg. In both Git and Hg merge tracking is done at the "commit" level instead of the "file/directory" level. One of the "side effects" is that you can't easily do a "partial merge": You've modified 30 files in your branch "feature_branch_x" You want to merge ONLY the files under (let's say) /kernel/gui With "item based merge tracking" (Perforce, ClearCase, Plastic SCM <= 3.0) you can just select a few files to merge, then checkin, then

Why does Plastic SCM keep asking if I trust the replication server's certificate?

阅读更多关于 Why does Plastic SCM keep asking if I trust the replication server's certificate?

I started getting the following prompt each time I run a command like cm status : cs:630@rep:MyServer@repserver:ssl://<obfuscated>:8088 WARNING: the secure connection hostname provided in the server certificate doesn't match the server's hostname. This means that the certificate was not issued to this hostname or that there is a network configuration problem with this host. - Certificate hostname: CN=ip-<obfuscated> - Server hostname: CN=<obfuscated> If you want to continue connecting to this host, choose 'Yes'. The certificate validation will continue (not recommended). If you want to abandon

Using PlasticSCM (or any DVCS client) to connect to TFS

阅读更多关于 Using PlasticSCM (or any DVCS client) to connect to TFS

问题 Has anyone used the PlasticSCM client tools to work against a TFS repository? Basically my current client is using the new hosted TFS for version control (not TFS-Git, just standard TFS), but I have seen the light of distributed version control systems on previous projects and now can't go back! Is there a recommended approach to getting a DVCS style experience with a standard TFS backend? I know I am asking a lot, but I have done some research and there seems to be hints that it maybe

git fast-export format and spaces

阅读更多关于 git fast-export format and spaces

I'm writing a fast-export/fast-import for Plastic SCM but I'm having issues dealing with directories and files containing spaces in their names. For instance, a git fast-export of something like: git mv "new directory" "second directory" ends up being exported as: D new directory/hello.c M 100644 :1 second directory/hello.c Instead of a " move " (R) operation. Same happens with a file with spaces in the name. Is there a way to handle it correctly? Does it mean that Git can't handle renames on paths with spaces? Edited with a real example below: I've something like this on a commit: R src

dvcs partial merge (git, hg merge tracking)

阅读更多关于 dvcs partial merge (git, hg merge tracking)

I've one question about general DVCS, including Git and Hg. In both Git and Hg merge tracking is done at the "commit" level instead of the "file/directory" level. One of the "side effects" is that you can't easily do a "partial merge": You've modified 30 files in your branch "feature_branch_x" You want to merge ONLY the files under (let's say) /kernel/gui With "item based merge tracking" (Perforce, ClearCase, Plastic SCM <= 3.0) you can just select a few files to merge, then checkin, then later repeat the merge and the pending files will show up. With Hg, Git: once you merge (there're ways to