mercurial

Simple way to “Update Project” with IntelliJ IDEA & Mercurial?

情到浓时终转凉″ 提交于 2021-02-19 05:46:26
问题 I have a Mercurial repo on a central server ( mercurial-server package on Ubuntu; repo URLs are of the form ssh://host/repo ), and a local working copy. I'm using IntelliJ IDEA 10.5 and its Mercurial plugin (hg4idea). I'm trying to do something simple: a colleague has checked in changes (commit & push to server), and I want to get those. In other words, I want to update the project (in Subversion lingo?). IDEA's Update Project (Ctrl-T / Cmd-T) only produces this message: Error: Skipped "/path

Following changes in JDK8 repository

我的梦境 提交于 2021-02-16 14:09:18
问题 I'd like to follow the development of JDK8, but what I see in the repo is strange at best: 6 days ago katleman Added tag jdk8-b60 for changeset e07f499b9dcc default tip changeset | manifest 7 days ago katleman Merge jdk8-b60 changeset | manifest Most changes look like "Added tag jdk8-b60 for changeset XXX" or "Merge XXX", there are a few entries looking like actual code changes, but no link to leads to code. Actually no single click brought me to anything marginally useful. I know nothing

Diff after committing locally

别等时光非礼了梦想. 提交于 2021-02-10 19:52:27
问题 I just cloned a repo from their remote. I built the software, changed about 4 files, committed them locally and now want to create a patch that I can show them. When I run : hg diff -U8p abc efg pqr > patch_file I don't see the changes I made. Does hg diff only compare the current files with the last committed files? How do I get this to work? 回答1: To diff the working directory against a particular revision REV , use hg diff -r REV To compare two revisions against each other, use hg diff -r

How to check whether specific revision is present on some Mercurial remote?

与世无争的帅哥 提交于 2021-02-10 14:27:45
问题 In Git SCM I'm using the following command to check whether a specific revision is present on some remote: git fetch <remote> <revision> -q --dry-run If the exit code of the command is zero that means the revision is present on the remote. For Mercurial I tried the following command: hg pull <remote> -r <revision> -q It works but the problem is that it actually pulls the revision if present on the remote, but not locally. Is there an equivalent of the --dry-run option for Git, or some other

Tortoise Mercurial - combine 2 commits

一世执手 提交于 2021-02-08 06:33:05
问题 I am starting to use Mercurial: 1.) I pulled the latest updates from public (central) repository (revision 3029) 2.) Working on code, I made a commit - revision 3030 3.) Some additional work, and - I made another commit 3031. So, both of my commits 3030 and 3031 are in a local repository. At this stage my local repo looks like this There are no commits by other people in Central repository. I am finished at this point, and submit the code for code review - my reviewer tells me that there

Tortoise Mercurial - combine 2 commits

笑着哭i 提交于 2021-02-08 06:32:40
问题 I am starting to use Mercurial: 1.) I pulled the latest updates from public (central) repository (revision 3029) 2.) Working on code, I made a commit - revision 3030 3.) Some additional work, and - I made another commit 3031. So, both of my commits 3030 and 3031 are in a local repository. At this stage my local repo looks like this There are no commits by other people in Central repository. I am finished at this point, and submit the code for code review - my reviewer tells me that there

Eclipse: which files to store in version control for GWT project

被刻印的时光 ゝ 提交于 2021-02-07 07:21:45
问题 I'm working on a GWT project in Eclipse with Mercurial for revision control. Which files should I store under version control? Or, perhaps more succinctly, which files should I not store since they are either part of GWT or are artifacts of the build process? I'm using Eclipse Helios and GWT 2.0.4. This question would apply to any version control system: Mercurial, Subversion (SVN), CVS, etc. 回答1: If your project is located outside your workspace, I would store everything but: the bin or cls

Eclipse: which files to store in version control for GWT project

て烟熏妆下的殇ゞ 提交于 2021-02-07 07:21:31
问题 I'm working on a GWT project in Eclipse with Mercurial for revision control. Which files should I store under version control? Or, perhaps more succinctly, which files should I not store since they are either part of GWT or are artifacts of the build process? I'm using Eclipse Helios and GWT 2.0.4. This question would apply to any version control system: Mercurial, Subversion (SVN), CVS, etc. 回答1: If your project is located outside your workspace, I would store everything but: the bin or cls

Copied file sharing same mutual history in Mercurial (TortoiseHG)

我与影子孤独终老i 提交于 2021-01-29 04:09:56
问题 In Mercurial (preferably via TortoiseHG interface) is it possible to copy a committed file, and for the new destination file to share the history for the source file? I'm pretty sure this is not possible, but I'm asking in the hope that it's just really well hidden in the documentation. I have a file with a fairly long history of changes, but I now need to have have a 2nd copy of this file within the project which will contain it's own individual changes. However, it would be exceedingly

Will commits in git and mercurial repositories with the same history have the same hash?

萝らか妹 提交于 2021-01-28 02:54:48
问题 When using git to clone an hg repository, or when migrating from hg to git, will the hashes remain the same? 回答1: By inspection, the answer appears to be "no". hg clone ssh://some.server.com/path/hgproject/ git clone hg::ssh://some.server.com/path/hgproject/ Followed by: hg log -l 5 git log -n 5 Show different commit hashes for the same commits. While both git and hg use SHA-1 hashes, there must be a difference in what they are hashing, perhaps the metadata. Any tooling dependent on the