dvcs

dvcs partial merge (git, hg merge tracking)

£可爱£侵袭症+ 提交于 2019-12-07 00:02:31
问题 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

Does merge direction matter in Mercurial?

六月ゝ 毕业季﹏ 提交于 2019-12-06 17:25:38
问题 Take a simple example: I'm working on the default branch, have some changesets committed locally, and I pulled a few more from the master repository. I've been working for a few days in my isolated local repository, so there's quite a few changes to merge before I can push my results back into master. default ---o-o-o-o-o-o-o-o-o-o-o (pulled stuff) \ o----o------------o (my stuff) I can do two things now. Option #1: hg pull hg merge Result #1: default ---o-o-o-o-o-o-o-o-o-o-o \ \ o----o------

Pushing updates to a pruned Mercurial branch

强颜欢笑 提交于 2019-12-06 16:07:46
I have two related repositories, a master, which contains a number of sensitive files which must not be leaked, and a 'public' version, created with hg convert with --filemap to exclude the sensitive files and directories. I would like further updates to the master that don't affect the sensitive files to be pushable to the slave, and updates to the slave to be pullable by the master. Right now this doesn't happen, as they are considered 'unrelated' repositories If this is possible with Git, but not with Mercurial, migration is a possibility, though it will be a nuisance since some development

Why is mercurial dumb when merging? How can I make pulling/merging changes simpler?

蹲街弑〆低调 提交于 2019-12-06 13:36:50
I just started to use Mercurial and I think I'm trying to do something very simple, something that should be quite typical, but I'm stumped on why it's so complicated, and why it doesn't just work the way it should (IMO). I share some a repository with a friend, he makes some changes and checks in several files and pushes them. Now in svn I'm used to just updating my working copy and getting his changes, no hassle. But with mercurial apparently I have to merge. What I don't get is: shouldn't mercurial be smart enough to figure out that if my friend made the most recent changes, and I haven't

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

自古美人都是妖i 提交于 2019-12-06 06:43:47
问题 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

Checking out a project's first commit with git

雨燕双飞 提交于 2019-12-06 06:40:24
Is there an easy way to find the SHA1 of the first commit in a project with a long history with git? Just off the top of my HEAD, this should get one of the 'first' commits of the current branch. git rev-list --reverse HEAD | head -1 (If the branch contiains two unrelated branches which have been merged together, it's not guaranteed which root you will get but you could use --date-order to select the oldest.) git log --reverse | head -n1 来源: https://stackoverflow.com/questions/3270696/checking-out-a-projects-first-commit-with-git

Why git is called a distributed source control system?

回眸只為那壹抹淺笑 提交于 2019-12-06 06:17:28
问题 It seems after committing code to the local repository, every programmer will run the command. git push origin master to push the local file to a certain remote server. It is not different with client/server model except a local copy, so why is it called a "distributed" one? 回答1: Tools such as CVS and SVN offer a centralised repository model. Everybody commits their changes to the same central repository. Each committer keeps a copy of the latest version of the central repository. When they

One word to summarize Git and other DVCS

拈花ヽ惹草 提交于 2019-12-06 03:44:17
As I getting acquainted with Git, I feel more and more that: Git and other DVCS jump a step futher than traditional centralized VCS in that they not only check out files in question, but also the whole version database. I think this is the major difference between DVCS and CVCS, and also the major foothold of all other benefits of DVCS. Or, let's put it this way: Multiple Local VCS + A Centralized Backup = DVCS. Changed the above equation to this: Multiple Local Clones + A Centralized Backup = DVCS. Right? VonC What you are describing is the very nature of a distributed system: the whole

Decoding git objects / “Block length does not match with its complement” error

巧了我就是萌 提交于 2019-12-06 02:57:51
问题 I'm stuck with very simple but annoying issue, and cannot find answer on the Internet. Hope you will be able to point me, what I've done wrong. I'm trying to decode object from Git repository. According to ProGit, file name and it's contents have been deflated during commit. I'm using C# to read object indicated by SHA1 into a stream, inflate it and convert into byte array. Here is the code: using System.IO.Compression; static internal byte[] GetObjectBySha(string storagePath, string sha) {

Unification of DVCS commands

穿精又带淫゛_ 提交于 2019-12-05 21:37:32
When working on multiple (open source) projects, multiple version controll systems start to be problematic. While they share common operations, I often make mistakes by typing hg add instead git add . I remember seeing project some time ago that made access to different source control software in uniform way by providing basic commands commit/ci add etc. in shell. Depending on repository it would in turn call hg add or git add etc. I've seen Amp: http://amp.carboni.ca/ (which seems to be down ATM) any other scripts like that? Johannes Rudolph I think unifications of two (in this case