mercurial-queue

Is `qrefresh` considered harmful?

谁说胖子不能爱 提交于 2020-01-12 23:38:17
问题 The qrefresh command in the MQ extension don't make sense to me. I'll explain my assumption: If you don't know on which revision should a certain patch be applied, it have a very little value. You just can't theoretically know what does the rejects mean. And even if there are no rejects on a certain revision, you're not sure the whole revision would compile. Once you qrefresh a certain patch in your patch queue, you're actually losing the parent of the next patch in the queue. So that without

What happens when I strip one version of a mercurial repository and try to synchronize with another one?

岁酱吖の 提交于 2019-12-24 04:44:11
问题 I know what happened to me when I did it. The synchronization was apparently successful, because no warnings were generated, but when I cloned the remote repository I saw that the synchronization didn't happen at all. I was using bitbucket as the remote repository. But I don't think this is what is supposed to happen. What is then? 回答1: When you strip a changeset from a repo, it only affects your local repository. It has no effect on others. If the changeset you stripped from the local repo

How can I keep some modifications from propagating in mercurial?

懵懂的女人 提交于 2019-12-22 18:03:05
问题 I am developing a web database that is already in use for about a dozen separate installations, most of which I also manage. Each installation has a fair bit of local configuration and customization. Having just switched to mercurial from svn, I would like to take advantage of its distributed nature to keep track of local modifications. I have set up each installed server as its own repo (and configured apache not to serve the .hg directories). My difficulty is that the development tree also

How to convert N local topmost commits to an MQ patch?

冷暖自知 提交于 2019-12-10 12:39:53
问题 I would like to arrange my last commits as an MQ patch. All the commits are local (never pushed to the server), but not all the local commits are to be converted. Say, I did 10 commits (never pushed) and now I wish to convert the last 5 to a patch. How do I do it? 回答1: Short version: $ hg qimport -r "-5:" Long version: $ hg qimport -r "last(all(), 5)" 回答2: You can import changesets via hg qimport if you've already got an MQ repository initialised (via hg qinit . The command only accepts one

How do I split work into multiple patches with mercurial queues?

风格不统一 提交于 2019-12-09 15:25:40
问题 If I've been churning away at the code for a while, and forgotten to create a patch series as I go, how do I create the patch series retrospectively? So far the only thing that comes to mind is: # Prepare and test the first batch of changes. $ hg qrecord -m 'first batch' 1.patch $ hg qnew -m 'stash downstream changes' stash-1.patch $ hg qdelete -k temp-1.patch $ make hello cc hello.c -o hello hello.c: In function ‘main’: hello.c:4: error: syntax error at end of input make: *** [hello] Error 1

Mercurial - Working with Queues similar to Shelves?

ぐ巨炮叔叔 提交于 2019-12-09 14:40:48
问题 I've recently started working with MQ as I like the idea of working on isolated patches and committing without affecting the repo until the changeset is refined enough. Before that, I used to work with Mercurial's shelves extension, but found it a bit unstable. What I'm still trying to figure out in MQ is how to keep patches separate from each other and apply them in no particular order, and across different branches. Here's my normal flow - 1. Start working on a new patch: hg qnew fix-bug

Updating Commit Message in Mercurial MQ extension

旧巷老猫 提交于 2019-12-07 01:04:27
问题 After using hg qnew and hg qrefresh to create and update a patch that I want to apply to my repository, but the commit message that I wrote when I did hg qnew was not very good, it did not reference the ticket number from trac, and I would like to say something in it about some of the issues that my commit addresses. How do I do something like hg qrewritemycommitmessage . I have examined the docs on the website and I have come up blank. 回答1: You just do hg qrefresh -m "new commit message" .

How can I keep some modifications from propagating in mercurial?

冷暖自知 提交于 2019-12-06 11:41:19
I am developing a web database that is already in use for about a dozen separate installations, most of which I also manage. Each installation has a fair bit of local configuration and customization. Having just switched to mercurial from svn, I would like to take advantage of its distributed nature to keep track of local modifications. I have set up each installed server as its own repo (and configured apache not to serve the .hg directories). My difficulty is that the development tree also contains local configuration, and I want to avoid placing every bit of it in an unversioned config file

Updating Commit Message in Mercurial MQ extension

泄露秘密 提交于 2019-12-05 05:34:52
After using hg qnew and hg qrefresh to create and update a patch that I want to apply to my repository, but the commit message that I wrote when I did hg qnew was not very good, it did not reference the ticket number from trac, and I would like to say something in it about some of the issues that my commit addresses. How do I do something like hg qrewritemycommitmessage . I have examined the docs on the website and I have come up blank. You just do hg qrefresh -m "new commit message" . In addition to $ hg qrefresh -m "new message" suggested by kuy, you can also use $ hg qrefresh -e to edit the

Is `qrefresh` considered harmful?

。_饼干妹妹 提交于 2019-12-04 10:01:57
The qrefresh command in the MQ extension don't make sense to me. I'll explain my assumption: If you don't know on which revision should a certain patch be applied, it have a very little value. You just can't theoretically know what does the rejects mean. And even if there are no rejects on a certain revision, you're not sure the whole revision would compile. Once you qrefresh a certain patch in your patch queue, you're actually losing the parent of the next patch in the queue. So that without your intervention this next patch is/might be useless. In order to fix the next patch, you'd better