mercurial

问题 I'm searching for compelling Git and Mercurial clients on Mac OS X. The most clients I've found so far were less compelling as I expected. Some of the clients are programmed even in Ruby or Tcl/Tk, which IMO aren't good OS X citizens in regard of integration in the OS. I have clients similar to Versions.app or Cornetstone in mind, which are Subversion-only clients. Perhaps somebody got an insider tip for me. 回答1: I just thought I'd mention that SourceTree is a Mac OS X client for both

问题 I've just installed Mercurial on my OSX Mountain Lion Max (10.8) and on my first commit I'm getting the error: abort: no username supplied (see "hg help config") I've seen a load of answers which suggest I need to create or copy a file form a certain location and paste it into another location and add my username and email to the document. If that is the right thing to do: Where is the file I need to copy (or what is the file called that I need to create) Where do I put that file Do I just

问题 My colleague recently ask me to help him with precommit hook which block push to central repo. This is famous https://hg.python.org/hooks/file/tip/checkheads.py Algorithm of checkheads.py gather heads in branch ignoring changes from another branches by piece: for x in xrange(p + 1, end): if repo[x].branch() != branch: continue History contains merges from default to prod and then back from prod to default . So checkheads.py didn't find that changesets merged at default (connected in graph)

问题 I am recently learning git, and found people can delete short branches, but in Hg, after merging the branch to default, how could I delete it? 回答1: You cannot. You can close the branch to hide it from the list of active branches, but you cannot completely delete it. This happens because in mercurial and in git the "branch" term means different things. In mercurial - it is a set of changesets. And in git - it is a pointer to a particular changeset. 来源： https://stackoverflow.com/questions

问题 All: I want to use kdiff to merge all files with a certain suffix (say *.c, *.h) and I want to do two things (turn off premerge and use internal:other) for all files with another suffix (say *.mdl). The purpose of this is to allow me to employ a type of 'clobber merge' for a specific file type (ie: un-mergable files like configurations, auto-generated C, models, etc..) In my .hgrc I've tried: [merge-tools] kdiff3= clobbermerge=internal:other clobbermerge.premerge = False [merge-patterns] **.c

问题 I wonder if anyone here has any experience with mercurial running on Ubuntu? I've been playing with it all morning and love everything I've seen so far. The one problem I though is when I do a merge and conflicts are detected, it doesn't automatically bring the file up in the command line editor to allow me to resolve the conflicts. It just tells me there's a conflict, then it's up to me to open the editor and resolve it. But this is strange as the docs show that the editor is automatically

问题 Usually, at the end of a hg bisect -c "my command" I get note saying I should run hg bisect --extend <ancestor_cset> to continue my bisection deeper. I am using mercurial 2.1.2. Before mercurial 2.1, I the message was to use hg update instead of hg bisect --extend It becomes really annoying went the culprit cset is like 10 levels deep so I have to manually do this command 10 times hg bisect --extend <ancestor_cset> && hg bisect -c "my command" . Is there a way to just automate the --extend

问题 Usually, at the end of a hg bisect -c "my command" I get note saying I should run hg bisect --extend <ancestor_cset> to continue my bisection deeper. I am using mercurial 2.1.2. Before mercurial 2.1, I the message was to use hg update instead of hg bisect --extend It becomes really annoying went the culprit cset is like 10 levels deep so I have to manually do this command 10 times hg bisect --extend <ancestor_cset> && hg bisect -c "my command" . Is there a way to just automate the --extend

问题 Usually, at the end of a hg bisect -c "my command" I get note saying I should run hg bisect --extend <ancestor_cset> to continue my bisection deeper. I am using mercurial 2.1.2. Before mercurial 2.1, I the message was to use hg update instead of hg bisect --extend It becomes really annoying went the culprit cset is like 10 levels deep so I have to manually do this command 10 times hg bisect --extend <ancestor_cset> && hg bisect -c "my command" . Is there a way to just automate the --extend

问题 I have a long standing problem: at work we're using mercurial as a DSCM, but we can't figure out how to keep our config files in sync. The problem is that we want to keep track of config files and want to be able to exchange the config file contents among developers, but every developer wants to have his connectionStrings section independent of others'. Is it possible to somehow keep config files tracked but to omit the connection strings section when pulling and pushing? We tried adding