dvcs

问题 After moving a file into another directory I cannot display the differences between two revisions any more. E.g.: hg init touch a hg add a hg ci -m "Added a" echo "Bli" >> a hg ci -m "Bli" echo "Bla" >> a hg ci -m "Bla" echo "Blub" >> a hg ci -m "Blub" hg diff -r 0 -r 1 a Results in: diff -r 8603b08f5a64 -r 16675581549e a --- a/a Mon Apr 23 09:03:25 2012 +0000 +++ b/a Mon Apr 23 09:03:25 2012 +0000 @@ -0,0 +1,1 @@ +Bli which is what I expected. However when I now move the file "a" into a

问题 Git, Mercurial, and Bazaar all seem to have similar formats for their ignore file (.gitignore, .hgignore, .bzrignore [see also bzr patterns]). In order to improve synchronization of the global ignore files, would it be safe to use one as an actual file and simply symlink the other two to that file? In other words, is there any danger in making my $HOME/.gitignore the canonical ignores file and doing ln -s $HOME/.gitignore $HOME/.hgignore ln -s $HOME/.gitignore $HOME/.bazaar/ignore or is there

问题 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,

问题 I want to utilize git in my development workflow. I'm using Eclipse Juno. I'm coming from CVS, but see lots of benefits from distributed VCS. I'm reading Pro Git book, have read quite bit of it to start using it, but somehow something does not work the way I think it should to. I'm doing well with it on single machine, but fail when I do remote repository sync. This is what I want to achieve: I have two PC-s, HOME & WORK. I want to develop on both PC, so chose git to sync them as well. I

问题 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

问题 The rebaseif mercurial extension automates the process, when pulling, of doing a rebase only if the merge can be done automatically with no conflicts. (If there are conflicts to resolve manually, it does not rebase, leaving you ready to do a manual merge of the two branches.) This simplifies and linearizes the history when developers are working in different parts of the code, although any rebase does throw away some information about the state of the world when a developer was doing work. I

问题 I'm new to GIT, and trying to understand the difference between git reset --soft and git reset --mixed . I know the latter resets the index, while the former does not, but I'm trying to understand what the material difference is: when would I use one versus the other? I've read this Stack Overflow post, which seems to suggest that mixed lends itself to making some changes before re-committing, while soft lends itself to simply re-committing immediately. I'm using SourceTree, with the staging

问题 I used to go back and edit my Mercurial commits to try to create a pretty history. I might have put two unrelated things into one commit, or I might have made several commits that were better understood as a single commit, but eventually it seemed like a waste of time and I got over the minor embarrassment of having less than perfect history. Do you still do this? Why is it worthwhile to you, why don't you do it anymore, did you ever do this, or are you thinking of starting? If I was

问题 BRIEF: I want to have two (or more) "streams of development" / environments track each other, sending changes between each other in both directions, without converging totally - while preserving certain key, essential, differences? DETAIL, ONE PARTICULAR EXAMPLE: Here is one particular example: I have been version controlling my home directory, glew-home, for, oh, 28 years. RCS, SCCS, many RCS wrappers, CVS, SVN, a brief period of experimentation with early DVCS like Monotone and Darcs, bzr,

问题 I'm looking for a way to visualize arbitrary information about my repository over time, which might be some version-dependent number, such as: lines of code number of lines in a latex document time between commits anything that can be output by a script What is the best way to visualize this information? More specifically, I'm using mercurial and would ideally like something with a decent interface, with plot resizing/scrolling/etc... Jenkins' plot plugin is decent but not great, but more