version-control

问题 What tools are available to migrate from clearcase to mercurial? Is it possible to move history? What kind of limitations are there? 回答1: Do not forget that ClearCase ( Central VCS) and Mercurial ( Distributed VCS) are very different. See Core ClearCase concepts for a full list. In the case of a migration, that means you are dealing with a repository-centric VCS (Mercurial) which implies "working with timelines" (a timeline being a commit, building a new changeset) In ClearCase though, there

问题 I modified and checked-in a bunch of files under my branch. Now I need to get the list of files I modified. Is there any scripts to do so? 回答1: The cleartool command find should help you find any element (file) with at least one version on a given branch. The following will find all the files on a branch cleartool find . -type f -branch "brtype(mybranch)" -print See find examples or "Additional examples of the cleartool find command" for more examples. The OP sarath adds: it gives me a

问题 We have a webservice named, let's say Foo. So there is a Foo.svc file and a code behind Foo.svc.cs. We add a silverlight project and wish to use the Foo.svc services so we add a Service Reference and call it's namespace FooBar. This creates the following files : Reference.cs Reference.svcmap Foo.xsd Foo.disco configuration.svcinfo Foo.wsdl Also various *.datasource files. Over time we update the Foo.svc and add more Web Services (methods and interfaces) and the number of files in the FooBar

问题 git pull --rebase removes unpushed merge commits. Is there a way to make it preserve them? Say my history looks like— A | \ B H | | C G | | D F | / E ( A being the merge commit.) After a git pull --rebase it becomes— H | G | F | X | B | C | D | E ( X being the new commits git pull --rebase inserted into my history.)— A is removed. I know you can use git rebase --preserve-merges to preserve them with git rebase , but I don't see a way to preserve them with git pull --rebase . 回答1: you can

问题 I am following the instructions on this blog to setup subversion on my development PC: http://www.codinghorror.com/blog/2008/04/setting-up-subversion-on-windows.html. I get an error when I get to the following line in the blog: "Congratulations! You just checked your first change into source control! " i.e. instead of saying "congratulations.....", it says: SVN E160043. Expected FS format between '1' and '4'. Found format 6. I have spent some considerable time Googling this but I have not

问题 So I see Git doesn't recognize folders, or should I say when the only change between commits is addition of empty folders to the working tree they're not show in git status after git add . . How would you handle the need to add empty folders to the working tree (for runtime storage) and have them be reflected/created when other repositories pull from the current repository (one in which the folders were added)? 回答1: People often put an empty file as a placeholder in the folder to overcome

问题 I use Beyond Compare (version 3.1.10) to compare different versions of Delphi Form Files, but I don't want to see differences concerning ExplicitTop, ExplicitLeft, ExplicitHeight and ExplicitWidth. Details: These lines will always begin with a number of whitespace characters, then "ExplicitXXX = " and a number. Older versions of Delphi didn't have these lines, so I want to ignore differences where these lines are added to the newest version, and I also want to ignore differences where the

问题 We need to store binary files (mostly MS Word documents, ranging from a couple of KB to a couple of MB in size) in a version control repository with over 100 "projects". Currently we use Visual Source Safe but there are some problems, the database is crashing sometimes and the access is slow. We are considering moving to Git or Subversion and we were wondering which one would be a better option for handling binary files. 回答1: Subversion, definitely. Today (2009), TortoiseSVN provides Explorer

问题 It seems that all of the initial Google results for "using subversion with xcode" are actually just tutorials for installing and configuring svn and Xcode, as opposed to actually using the two (i.e. interacting with svn via Xcode's GUI). Is anyone aware of a good guide that teaches the tricks and pitfalls of working with svn via Xcode's GUI? Something that bridges the gap between the most excellent Version Control with Subversion book and the Xcode IDE (as in pure Xcode GUI without any

问题 What are the best practices while including a Xcode project under version control. 回答1: This is what is in my Global .gitignore file which you can see as a gist on GitHub, but the Xcode list can be applied to other systems # Mac OS X *.DS_Store # Xcode *.pbxuser *.mode1v3 *.mode2v3 *.perspectivev3 *.xcuserstate project.xcworkspace/ xcuserdata/ # Generated files *.o *.pyc #Python modules MANIFEST dist/ build/ # Backup files *~.nib \#*# .#* 回答2: Check in project.pbxproj , ignore the user