mercurial

问题 I'm struggling to find the mercurial workflow that fits the way that we work. I'm currently favouring a clone per feature but that is quite a change in mindset moving from Subversion. We'll also have issues with the current expense we have in setting up environments. Using hg pull --rebase seems to give us more of a Subversion-like workflow but from reading around I'm wary of using it. I think I understand the concepts and I can see that rewriting the history is not ideal but I can't seem to

问题 I am using winmerge as my extdiff tool, like this: [extdiff] cmd.winmerge = C:\Program Files\WinMerge\WinMergeU.exe opts.winmerge = /e /x /ub /wl The thing is, when I run hg winmerge it seems that it sends all of the files at once, while for example in Git, when I do a diff it calls the difftool with one modified file at a time. Can I get the same behaviour in Mercurial? 回答1: Like explained in Mercurial: The Definitive Guide, extdiff creates two snapshot of the source tree and call the diff

问题 We are using PyCharm as the Python IDE for a project. Developers use different kind of OS setup, e.g., python path is not the same for some of us (some have local interpreter stored at different location or remote interpreters). Unfortunately, python interpreter path is stored in the .idea PyCharm project folder (.iml file). It then leads to conflicts or python path overriding when merging branches with Mercurial. We would like to keep tracking under version control the .idea folder and the

问题 Currently my company is using cvs for version control. I want to use mercurial locally because of it's flexibility and merging capabilities. This will make my job a lot easier. How should this be done? 回答1: First : Get the CVS repository locally. Second : Create a mercurial repositories locally over this CVS repository. This will be used as your remote mercurial server. Third : Clone this mercurial repository and do you work here. Mercurial provides better merge support than cvs and will make

问题 Does anyone know of an MSSCCAPI provider for Mercurial? I'd like to try out Kiln/Mercurial with PowerBuilder, but the PowerBuilder IDE only recognizes MSSCCAPI providers (which is not the same as MS SCC Package API) and the only one I can find is the original version of HgSccPackage. I've contacted the developer and he has stated that he will not switch back from the Package to the regular API so that option leaves me with no upgrade path. This question was asked in July of 2010 with only the

问题 In ClearCase, if I am working on some file X and want to also see its previous version (say version 5), it is available as X@@/main/5 . Is something similar available with other (preferably free) version control systems? Mercurial has hg cat and hg co , but they still do not come close to ClearCase's feature above. 回答1: A quick Google search found gitfs: gitfs is a FUSE-based filesystem for working with source trees stored in git repositories. The eventual goal is to provide a convenient way

问题 I have installed Windows7 on my computer, and I had to change all permissions/take ownership - which apparently "touched" all my files, and now everything appears to be "modified" (when I do "hg status"), but only some files have actual changes. Is there a command I can run so that I will either "commit" or "revert" all the files that have no actual change in them (i.e. text is unchanged, even if file attributes are changed). added: I've upgraded from WinXP to Win7. I didn't actually "copy"

问题 I have just merged two repositories following advice given here. Since both repositories are completely unrelated, i used hg convert --filemap fm rep1a rep1b hg convert --filemap fm rep2a rep2b to move files in repository 1 to a subdirectory a, and files from repository 2 to a subdirectory b. There are no conflicting files in both repositories now, so I combined them both. The result is a repository that has a merge revision with two parents, one containing the history of repository 1, the

问题 SHORT VERSION How do you figure out which DLL is failing to load (and potentially why) when a process exits with error code -1073741502? LONG VERSION I'm trying to write a pretxnchangegroup hook for Mercurial, and as a part of that hook I need to get the output of running the command: hg log The code that I'm using to start and run the hg.exe process is as follows: string Command = "log"; Process p = new Process(); ProcessStartInfo psi = p.StartInfo; p.StartInfo.FileName = @"C:\Program Files

问题 When I clone out a Mercurial repository it usually shows files as being modified when they have not. This can happen when I do the following steps; $ hg clone <url> $ cd project $ hg st .... large number of files with M at the start for modified $ hg diff .... no result. I think this is because the files have had their permissions changed in the process so it seems like the files are different since hg doesn't actually do a diff on each file when hg st is used. I know this can happen in git