version-control

问题 First, sorry because of my poor English and explanation. This is the edited version of my question after receiving some comments and I realize what made you confused. The project I'm working on has about 10 people and each person will implement some "work" in the project. We share 20 model files (text files) When people do "work", they have to go directly to model files and add/remove/edit some lines in 20 text files above. Assume that: A implemented work no. 1, 4, 6, and 10. B implemented

问题 on my remote repository a new branch has been created. In GitBash in my Working Directory (on master branch) I type git remote update and git pull . To my understanding git remote update will update all branches set to track remote ones as explained here: What is the difference between 'git remote update', 'git fetch' and 'git pull'? So when I type git diff master newBranch --name-only I expected to see a list of files which are different in both branches. But instead I got the following

问题 I'm about to commit Eclipse .classpath and .project into SVN, following the good advice I got here on SO. The problem is that some JRE definitions are unique to a developer's machine, e.g.: <classpathentry kind="con" path="..JRE_CONTAINER/org..../Jeffs JRE"/> If this line is committed, it fails on other machines that don't have Jeffs JRE . Any idea for a workaround? Could the JRE definitions be shared as well? 回答1: I never saw adding specific IDE configuration files as a good practice, but

问题 I know there is TortoiseCVS, but I'm wondering if there is an easy way of sucking down source code in a CVS repository, just using SVN tools (without having to install CVS tools). Since SVN seems to have taken the preferred spot in OSS, I have to believe somebody has written a tool that will map CVS databases to SVN repositories. EDIT Based on a few responses, while migrating off of CVS to SVN is cool, mostly I'm looking for a way for me to use my SVN client to pull from a CVS database with

问题 I'm working on a Django back end that will be used by two websites (i.e., a job board for non-profits and a job board for for-profit companies), but I'm not sure how this is best structured to make it easy to push/pull updates to the two websites. The Django code for the websites is highly similar (let's say over 95% overlap), but the websites have slightly different templates and separate CSS style sheets, in order to give each a distinct look and feel. My inclination would be to set this up

问题 I mainly code small programs for myself, but recently, I've been starting to code for my peers on my team. To that end, I've started using a Mercurial repository to maintain my code in some form of version control (specifically, Tortoise-Hg on Windows). I have many small scripts, each in their own directory, all under one repository. However, while reading Joel's Hg Tutorial, I tried cloning a directory for one of my bigger scripts to create a "stable" version and found I couldn't do it

问题 I'm working with an embedded system software project right now, and we're facing some problems dealing with some precompiled binaries living inside our repository. We have several repositories for different parts of our project: One for the application itself, one for the OS, one for the bootloader and several libraries. All of them, except the one for our application, are shared with other teams, for other projects. We are using git (and changing is not an option right now), but I think we'd

问题 Should the WEB-INF/lib directory and it's contents be versioned by a VCS? 回答1: If you can easily rebuild its content, I would argue against versioning it. Considering one of the main goals of a VCS (manage the history and get the delta between one version and the other), the history and delta of binaries is often not well managed in a VCS. those binaries are best referenced through an artifact repository (like Nexus), where a building script (like Maven) can access and copy them where they

问题 I'm an Eclipse newbie, and I have an Eclipse workspace with projects for a Google Web Toolkit App. What directories/files should I commit to version control (we're using Subversion)? I believe I don't need to commit .metadata directories, and it seems to me that I don't need to commit war directories, but I'm not positive. The committed projects need to be shared across multiple developers. 回答1: stacker covered Eclipse's files, let me cover GWT ;) Assuming you are using the standard layout:

问题 I have set up a remote Mercurial (Hg) repository that holds a large Java project. I would like to monitor any changes done to the project's pom file and receive e-mails when changes were made to the pom. I would like to exclude all other file changes from notifications as I am only interested in monitoring any possible changes in dependencies (hence the POM). Is there any Mercurial Extension or workaround using Jenkins to subscribe to the change history for one individual file inside a