mercurial

Make another branch default?

醉酒当歌 提交于 2020-01-20 16:51:53
问题 I have a Mercurial repo at Bitbucket and on my local machine, both are mirrors, up to date. I created a feature branch, reflected in both repos. I did all my work in the feature branch. The feature branch is now complete and I want to now make it the default for the main repo and my local copy. I don't really care about the default branch, enough work has gone into the feature branch that all I want to do is designate it as the new default. I don't think I want to merge nor should I? How can

How to convert mercurial repository to git repository without losing branches?

不羁岁月 提交于 2020-01-19 17:09:48
问题 I want to convert mercurial repo to git repo. Actually I did but I didnt see branches. After I converted repo I can see just one branch(as master) I cannot see any other branches but I can see history(all changes) as right. when clicked any commits I can see like this information : Date: 19 Nisan 2019 Cuma 15:14:37 Committer: sevgi.cakmak Change dialog header --HG-- branch : sevgi-2.0.0 but I cannot see sevgi-2.0.0 branch on the left side (I am using sourcetree). My steps: mercurial.ini file:

Error “Unlinking directory not permitted” when I'm doing hg update with cygwin

陌路散爱 提交于 2020-01-17 05:21:10
问题 When I'm trying to change the branch where I am , I'm getting this error everytime: # Just check in which branch I am $ hg branch django1.6 $ hg update --clean default abandon: Unlinking directory not permitted: 'D:\Projects\abc\abc' ( abc is the project name, replace for simplicity here). Since it's a Django project, named abc , I have a subfolder abc that I have created in the django1.6 branch. This folder doesn't exist yet in the default branch , so if I'm changing the branch, the folder

Error “Unlinking directory not permitted” when I'm doing hg update with cygwin

本秂侑毒 提交于 2020-01-17 05:21:10
问题 When I'm trying to change the branch where I am , I'm getting this error everytime: # Just check in which branch I am $ hg branch django1.6 $ hg update --clean default abandon: Unlinking directory not permitted: 'D:\Projects\abc\abc' ( abc is the project name, replace for simplicity here). Since it's a Django project, named abc , I have a subfolder abc that I have created in the django1.6 branch. This folder doesn't exist yet in the default branch , so if I'm changing the branch, the folder

Is there anything like svnserve for Mercurial?

对着背影说爱祢 提交于 2020-01-17 04:19:06
问题 I'm attracted to Mercurial as a DVCS platform, but would like an easy to use server similar to svnserve. There is HgServe, but that appears to be read-only. If I want to be able to host the server on another machine, it appears I need to set up apache, etc. Is that really the case? Is there an easier method for a local network where security isn't an issue? 回答1: The problem here is that it's so easy, the mercurial documentation fails to appropriately cover it. If you clone with ssh: hg clone

Merging mercurial repo after lfconvert

江枫思渺然 提交于 2020-01-16 21:55:49
问题 I want to use the largefiles extension to track binary data in my repos. The documentation states that you have to convert your "normal" repo to a "largefiles" repo. Like so: hg lfconvert normal_repo largefiles_repo Is it possible to merge two repos after they have been converted to a largefiles repo without both of this repos to have been converted at the some "time". Or do all repos have to share a common "lfconvert event" to be able to merge between them? 回答1: It looks like lfconvert

mercurial-server says: No section: 'paths' Must be run as the 'hg' user

狂风中的少年 提交于 2020-01-16 01:31:11
问题 I try to tune hg through this (official) tutorial: http://dev.lshift.net/paul/mercurial-server/docbook.html when i try: sudo -u hg /usr/share/mercurial-server/refresh-auth it says: No section: 'paths' Must be run as the 'hg' user So it is a problem UPD: way to resolve, and true tutorial for install mercurial-server: on remote server: 0) save your repos to homedir 1) <username>@<remote_server>:$ sudo apt-get purge mercurial mercurial-server 2) <username>@<remote_server>:$ sudo userdel -r hg 3)

Diffing a file against last Mercurial changeset, should it be different?

a 夏天 提交于 2020-01-15 11:09:14
问题 I'm seeing something I don't expect in my Mercurial repo. A change that has been made in a branch is showing up in default. There is no changeset in the log, merge or otherwise, accounting for the change moving into default from the branch. I checked the basics: I'm in default, did an 'hg pull', 'hg update -C', 'hg purge', and an 'hg st' which came back clean. If I look at the file locally the change I am expecting is not there. If I do an 'hg diff -r ' then it tells me that my local file is

Mercurial: How to subsequently make a change to a changeset summary after it has been checked in? [duplicate]

一笑奈何 提交于 2020-01-15 11:05:17
问题 This question already has answers here : Closed 9 years ago . Possible Duplicate: Is it possible to edit a summary after a commit using TortoiseHg? In Mercurial, if I forget to include the defect # in a check-in summary, how do you change the summary of a previously checked-in changeset, besides tweaking a flat-file and checking in a subsequent changeset just to comment on the previous check-in? Using TortoiseHG. 回答1: the appropriate way to do this is to use histedit. Histedit allows you to

How do I prevent someone from pushing multiple heads?

对着背影说爱祢 提交于 2020-01-14 13:00:12
问题 I have colleagues who push multiple heads by using the --force switch because they haven't merged properly. Are there any ways to prevent this? 回答1: You can do this with a pretxnchangegroup hook on the server side. Here are a few examples: http://www.softwareprojects.com/resources/programming/t-mercurial-hook-forbid-2-heads-1910.html All those hooks are doing is making sure that after the changegroup is applied that there's still only one head (or only one per branch if you want to get fancy)