version-control

问题 There seems to be many questions WRT tool to generate diffs between xmls, but there wasn't this question yet, so anyone who knows this show me a link or paste any example anyone already solved this problem. Canonicalizing an xml file means, reordering the appearance of attributes reordering the appearance of tags (selectable by command line option) insert line ending(CR/CR+LF/LF) if there isn't at the end of a close tag insert indentation tab(space) remove redundant spaces and line endings

问题 I have spent some months working on a web application and we're come close to production stage. It's soon time to expand the development group with 1-3 people on this project. I have not too much experience on working with SVN, but It's obviously the choice for a big part of the larger companies out there, so I am guessing that the pros of SVN without a doubt outweights the time spent on commit/check ins / check outs etc. The workflow seems to become a bit more complicated with SVN, and even

问题 I am trying to merge two repositories, and there are only a couple of "real" conflicts, but there are about 70 file conflicts of "Both added". When viewing a git diff, however, it only shows file mode changed. What would be the best way to mass-accept the current file mode and ignore the incoming file mode? A little background: These 2 repositories are of the same code, but one has been tracked through SVN, so doesn't have a history. I'm using git-svn to track it now and merge it with the

问题 Currently my team uses Visual Sourcesafe, and being very familiar with how horrible the GUI is first hand and having heard the internet mummer about how unreliable it is, I've been trying to push a move to SVN. Today I was talking to manager about the eventual move, which he supports, and he asked if it was possible to create sourcesafe style links in SVN. Links, for people not familiar with sourcesafe, work the same conceptually as file links under Linux. We use them to link shared code

问题 I need to make sure commit messages are some what legit else reject it. The commit message should be like "#123 fixing missing bracket" I want to make sure it begins with hash, there is an integer (no 123a), and the message is at least 10 words. Nice to have: the message would not be the exact same in a row I am using this Trac plugin for change set, it describes the commit message format in more detail http://trac-hacks.org/wiki/TracTicketChangelogPlugin Thanks, 回答1: You can create a pre

问题 In an Emacs Lisp function, I want to know the VC root of an arbitrary folder (if under source control), the same as something like vc-print-root-log does it. I'm trying to do it from outside the VC file/folder (though creating a temporary buffer to do this would be fine). I currently have a git-only solution through magit - (magit-get-top-dir dir-name) . I tried using (vc-deduce-backend) and the 'root command, but the variables that vc-deduce-backend checks seems to only be set in existing vc

问题 I'm trying to hack git to do backup for me. The data is so large relatively and I cannot afford a working copy and a git repo on any of my hard drives. So, I need to git add/commit to a bare repo from a non-git folder. Hard drive 1: working copy / non-git Hard drive 2: bare git repo Goal: commit from hard drive 1 to hard drive 2 回答1: No need for a bare repo. you can specify a different git folder: git --git-dir=/other/drive/some/path add alternatively you can specify a different working

问题 I'm trying to figure out whether a merge conflict was responsible for a bug, but I'm having difficulty because I'm not clear on how conflict resolution affects git blame . Let's say I have a file in master: a(); b(); c(); I modify it in master: a(); d(); c(); but so does a co-worker, and they modify it differently, in a separate branch which they then merge in to master: a(); e(); c(); Can resolving that conflict affect the blame? In other words, if my co-worker resolves the conflict by going

问题 I'm trying to figure out whether a merge conflict was responsible for a bug, but I'm having difficulty because I'm not clear on how conflict resolution affects git blame . Let's say I have a file in master: a(); b(); c(); I modify it in master: a(); d(); c(); but so does a co-worker, and they modify it differently, in a separate branch which they then merge in to master: a(); e(); c(); Can resolving that conflict affect the blame? In other words, if my co-worker resolves the conflict by going

问题 Say I have a branch A, and from that I branch B. I make a bunch of changes on A, then checkout B and do a git pull . Now I make a change on B but realize that it should've been in A. If I now try to git checkout A , I get "Your local changes to the following files would be overwritten by checkout" to the file I touched. Why would my change be overwritten if I just did a git pull in B and haven't touched that file in A since? 回答1: The reason you get that message is that the underlying file