dvcs | 易学教程

Can I mark a branch as 'not going to push'?

阅读更多关于 Can I mark a branch as 'not going to push'?

问题 I use named branches in Mercurial. In doing so I have created one branch called playground where I can try out various wacky experiments. I never intend to merge this branch into any others and I never want to push it to our main repository. Since creating it, every time I do a push I am told I have added a new branch and I have to use the --new-branch flag. At this point hg push -b default (or whatever branch I'm pushing) works fine but it's annoying. Is there any way to suppress that

How can multiple people contribute to resolving conflicts during a large DVCS rebase operation?

阅读更多关于 How can multiple people contribute to resolving conflicts during a large DVCS rebase operation?

问题 A rebase of a very long-lived topic branch can be quite painful and take hours or days of work for one person. How can a second (or third) person contribute to the rebasing effort? Is there some tool that can find independent conflicts that two people could work on independently? 回答1: turn on rerere git config --global rerere.enabled 1 git config --global rerere.autoupdate true whenever you resolve a conflict, the resolution will be recorded. Now you have to share it: Set up a symlink to the

How do I specify a merge-base to use in a 'hg merge'

阅读更多关于 How do I specify a merge-base to use in a 'hg merge'

I'm trying to do a complicated merge in a complicated hg repository. I'm not happy with the "newest shared ancestor" that Mercurial chooses to use as the "base" to perform the merge. I'd like to specify a specific commit of my own choice to use as base. Is this possible, and if so, how? Mercurial 3.0: You can now select the ancestor to use as a merge base. You do that by setting merge.preferancestor . Mercurial will tell you about it when this makes sense. With the example below, you would see: $ hg merge note: using eb49ad46fd72 as ancestor of 333411d2f751 and 7d1f71140c74 alternatively, use

Embeddable distributed version control system in Java?

阅读更多关于 Embeddable distributed version control system in Java?

Is there a distributed version control system (like git or Mercurial) that can be used as an embedded library in Java applications (to implement versioned and synchronizable storage for application data), ideally written in pure Java and under a permissive license? @Josh Moore's reply led me to JGit , which seems to be a competitor to JavaGit. JGit is pure Java and licensed under BSD. Some further digging unearthed HgKit , which aims to implement Mercurial in Java. It is still pre-alpha and GPLed. I do not know of any pure Java solutions. But, check out http://javagit.sourceforge.net/ you can

Submitting Hg changes back to SVN

阅读更多关于 Submitting Hg changes back to SVN

问题 I've began work in an SVN repository. I've cloned a subfolder of it into a local Hg repo with hg clone . Afterwards, I wanted to share this with a colleague who does not have access to the SVN repository. I've created a private BitBucket repository, and we occasionally pushed the changes, and hence I had to pull them. hgsubversion does some nasty things to changesets, such as changing their committer (and I believe even the hash). When I tried pushing and pulling to the BitBucket repo, I had

Showing renames in hg status?

阅读更多关于 Showing renames in hg status?

问题 I know that Mercurial can track renames of files, but how do I get it to show me renames instead of adds/removes when I do hg status ? For instance, instead of: A bin/extract-csv-column.pl A bin/find-mirna-binding.pl A bin/xls2csv-separate-sheets.pl A lib/Text/CSV/Euclid.pm R src/extract-csv-column.pl R src/find-mirna-binding.pl R src/modules/Text/CSV/Euclid.pm R src/xls2csv-separate-sheets.pl I want some indication that four files have been moved. I think I read somewhere that the output is

Mac specific optimizations in ~/.gitconfig [closed]

阅读更多关于 Mac specific optimizations in ~/.gitconfig [closed]

问题 As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. Closed 8 years ago . I read that discussion about the content of "~/.gitconfig" on Linux: https://stackoverflow.com/questions/267761/what-does-your

Combine DVCS with Visual Source Safe

阅读更多关于 Combine DVCS with Visual Source Safe

问题 I'm forced to use Visual Source Safe 2005 at work. I'd like to combine that with a DVCS, so that I can check in files locally without disrupting my co-workers if there's a bug or it doesn't compile. In my attempts with Mercurial, it works, but causes a few weird issues. Namely, it thinks someone else has checked out the files I have checked out. Here's my thoughts on how I should manage it: Disable auto-checkout. Work locally in Mercurial When I'm ready to push my changes... Clone my

How does the 3 way merge in Mercurial/Meld work?

阅读更多关于 How does the 3 way merge in Mercurial/Meld work?

问题 I'm working on a project where I have a commit that introduced a feature with major problems that weren't discovered immediately. Now I want to completely remove that revision while keeping the work following it but i'm having a hard time wrapping my head around this 3 way merge. Here is a simplified graph of my project. o changeset: 134:7f81764aa03a | tag: tip | parent: 128:451d8a19edea | summary: Backed out changeset 451d8a19edea | | @ changeset: 133:5eefa40e2a29 | | summary: (Change I need

How do I “switch” with Mercurial

阅读更多关于 How do I “switch” with Mercurial

问题 How do I do what svn switch does, in Mercurial? That is change my working directory to switch to another branch in the repository? 回答1: hg update -r<REV> The update command will switch to a specified revision. 回答2: The switch command does two things in Subversion: Update the working copy to mirror a new URL within the repository. This behaviour is similar to ' svn update ', and is the way to move a working copy to a branch or tag within the same repository. Rewrite working copy URL metadata