dvcs

问题 I have a problem which I can't seem to understand. I'm using TortoiseHg (version 0.7.5) on Windows but on Linux I have the same problem. Here it is: My .hgignore file: syntax: regexp ^[^\\/]+$ What I'm trying to achieve is to add to the ignore list the files which are in the root of the hg repository. For example if I have like this: .hg +mydir1 +mydir2 -myfile1 -myfile2 -anotherfile1 -anotherfile2 .hgignore I want myfile1(2) and anotherfile1(2) to be ignored (names are only for the purpose

问题 The point in removing trailing whitespace is that if everyone does it always then you end up with a diff that is minimal, ie. it consists only of code changes and not whitespace changes. However when working with other people who do not practice this, removing all trailing whitespace with your editor or a pre-commit hook results in an even worse diff. You are doing the opposite of your intention. So I am asking here if there is a tool that I can run manually before I commit that unstages

问题 Closed . This question is opinion-based. It is not currently accepting answers. Want to improve this question? Update the question so it can be answered with facts and citations by editing this post. Closed 6 years ago . Disclaimer: This is a subjective question. Please follow relevant guidelines. I am considering the migration of source code from a traditional VCS to a DVCS . Since having a decent GUI web-based frontend and workflow tools are a must, the two obvious candidates are Bitbucket

问题 We are using a Subversion server at my job for source control. I was thinking that rather than keeping up with my own branch, I would run Mercurial on my workstation, commit locally, and then commit to the Subversion trunk whenever I’m done with whatever feature I’m working on. From my understanding of DVCS this is theoretically possible. Can anyone offer reference to any tutorials on this specific type of integration, or point to any tools that will make such a process as seamless as

问题 I've been reading about hg bisect and its interesting to be able to know which revision introduced a bug, but I'd like to know what people use this information for. The only thing I can think of is trying to narrow down which dates might need a data fix if it's a bug that results in some form of invalid data. update: I think I completely misunderstood the purpose before I posted this. I was thinking that I would do the debugging and find which line(s) introduced the bug and then use bisect.

问题 I'm a Git user trying to use Mercurial. Here's what happened: I did a hg backout on a changeset I wanted to revert. That created a new head, so hg instructed me to merge (back to "default", I assume). After the merge, it told me I still had to commit. Then I noticed something I did wrong when resolving a conflict in the merge, and decided I wanted to have everything as before the hg backout , that is, I want this uncommited merge to go away. On Git this uncommited stuff would be in the index

问题 I've recently started getting into Git on a personal project, and I can see how a DVCS might benefit us at work (which is a large enterprise software company, currently running Perforce). Feature work in my team for example mostly consists of developers creating their own branches; sometimes these are shared between small teams of developers. I think it would be more efficient in this instance to use a DVCS. In the more general case, though, I'd be interested to hear from people that use a

问题 We started using Mercurial a several weeks ago. Most developers follow this workflow: work on a feature commit -m "Worked on feature ABC" pull -u If branch merge commit -m "Merge" push Today, one of our developer suggested that we do: work on a feature pull -u if branch merge commit -m "Worked on feature ABC" push That way, we have a lot less "Merge" changesets in the log. Some of us think it's just a matter preference. Some of us think one is better than the other. We don't have much

问题 I have a repository called Generic , which is a generic application. I have forked it into a repository called Acme , which just builds upon the application stored Generic repository and adds Acme Co branding to it. If I make changes to the core functionality in Generic , I want to update the Acme repository with the latest changes I have made to the core functionality in Generic . How would I do that? As far as I can tell, I am essentially trying to merge the changes made in an upstream

问题 I have been trying to follow the instructions in the answer to this question, using kiln. i'd like to be able to arrange things as follows: /somepath/thirdparty maps to a kiln repository "thirdparty" and contains assorted code /somepath/common maps to a kiln repository "common" and contains shared code i have written and /somepath/project1 maps to kiln repository "project1" /somepath/project1/thirdparty maps to branch of thirdparty above /somepath/project1/common maps to branch of common