mercurial

Histedit shows conflicts on original repo but not on clone

老子叫甜甜 提交于 2019-12-11 19:06:21
问题 I want to collapse several commits into one or two in my Mercurial repository and I'm using histedit for it. Since I was not very sure how it would turn out, I've cloned my repo and tried the operation on the clone. (I've done it many times before, but this time I had some branches, and I wasn't sure how to deal with it. In the end, I've used MQ to store the branch commits while doing the collapse). Everything's worked fine, no conflicts or anything, as it should be. So I've gone and tried it

I can't find the code for diff binary in mercurial source code [closed]

南楼画角 提交于 2019-12-11 17:35:51
问题 Closed. This question is off-topic. It is not currently accepting answers. Want to improve this question? Update the question so it's on-topic for Stack Overflow. Closed 7 years ago . I am reading source code of mercurial,but what I saw in bdiff.c and mdiff.py is processing text, not binary.but they said mercurial treat all files as binary.I am confused. 回答1: bdiff.c and mdiff.py both works perfectly fine on binary files. They won't give you optimal diffs since they rely on the presence of

How to make mercurial sort the output of `hg log` by commit date?

别说谁变了你拦得住时间么 提交于 2019-12-11 17:18:16
问题 How can I make mercurial order the output of hg log by commit date? The output seems to be ordered by the date I pull the commits into my repository instead of when they were committed. 回答1: You need to use a revset: $ hg log -r 'sort(all(), date)' If you want to see the most recent commits first, do: $ hg log -r 'sort(all(), -date)' See hg help -v revsets for more details. 来源: https://stackoverflow.com/questions/47269015/how-to-make-mercurial-sort-the-output-of-hg-log-by-commit-date

How do I get Mercurial working on my SSD?

∥☆過路亽.° 提交于 2019-12-11 17:07:45
问题 I had a problem working with mercurial, outlined here. I eventually figured out that mercurial is just not working properly at all on my SSD drive. It works better on my secondary HDD on the same machine, but doesn't resolve my other issue. I am using TortoiseHg 4.9.1 on Windows 10. Doing the following works fine on the HDD: hg init temp cd temp <create test.txt> hg ci -A -m "test" But on the SSD, I get the following message, and the file is marked as added, but not committed: nothing changed

Hg (Mercurial SCM) and Notify - How to get project name and edit email subject?

北慕城南 提交于 2019-12-11 16:16:10
问题 I'm using Hg(1.6.4) with Notify extension and I am trying to override the changeset template with project name on email subject. I read the "hg template help" and I not found a specific tag to get the project name. The {webroot} and {root} tags got all path and I wanted PROJECT name only, i.e: /home/USER/repo/PROJECT/rev Is it possible to extract only PROJECT name? Is there any tag or template to parser and to get the project name? 回答1: Uncomment the strip variable in hgrc file #If you want

Is there a real advantage using a web server for Mercurial repositories?

北城余情 提交于 2019-12-11 14:49:05
问题 I am a remote worker and I have VPN access to a Windows file server share. It seems that everywhere I read that the recommendation is to use a Web server based repository. It would be a tough sell for me because I don't know the real advantages to weigh against the cost of maintaining a web server whether it is a Windows or Linux based. There would only be two people accessing it at this time and neither would need access outside the VPN or the main office. Someday maybe more. but not in the

OpenSUSE Apache - Windows LDAP - group user authentication - Mercurial

好久不见. 提交于 2019-12-11 14:26:19
问题 OS: OpenSUSE Linux Version control: Mercurial Hg Web Front: Apache2.2 I'm able to click browse http : // servername : port/ hg As soon as I click on it, it prompts me for Windows AD directory credentials. Now, I have the following repositories in /srv/www/htdocs/hg/repos folder: RepoProjectA RepoProjectB RepoProjectC clicking on the above repository links is OK as I'm able to see Hg front end. Now, I want to add authentication and authorization so that: A) Only users "c123456", "c654321" can

Mercurial premerge = false only for specific files, = true for all others?

走远了吗. 提交于 2019-12-11 13:39:34
问题 Is it possible for Mercurial to automatically merge all changes except for specifically nominated files? For the specific files there are some lines that may be overwritten so I want it to force a manual merge with the visual merge tool. The use-case for this is pulling from a parent repo and building a different version of an app form the same code. The specific files would include the Visual Studio project file & AssemblyInfo file - I want to retain the version-specific references and .NET

Abstracting frequent local commits with a push?

眉间皱痕 提交于 2019-12-11 13:29:15
问题 Recently I switched to Mercurial from Subversion and was excited to learn about local commits . However I had a different workflow in mind than how it currently works. I perform very frequent commits, ie. my one single push to a central repository involves 5-6 local commit changesets each with their commit log . However I wouldn't care to see/revert to these individual commits later in the future but to my single push . I was hoping to see this push operation as an abstraction for my multiple

creating subdomains with apache on debian; creating hgweb subdomain as second step

妖精的绣舞 提交于 2019-12-11 13:13:49
问题 After hours of trying to setup subdomains on my dedicated root server, I'm asking you for help. Target: being able to create and access subdomains setup an own subdomain for mercurial repositories, using hgweb Information about the server: Debian Linux, Kernel 2.6.32-028stab094.3 Apache/2.2.16 (Debian) Mercurial 1.6.4 libapache2-mod-wsgi-py3 installed First question: what is wrong with my apache configuration that I can't access my subdomains via the browser? Actually, I can access the root