Mercurial: Pending Files

Question

I have two repositories, dev and testing. In dev, I have made several commits since the last click on testing. However, now I want to postpone all these commits, make changes, push them to testing, and then return these commits. The rack only works with uncommitted files.

What should I do? Roll back or roll back or return each commit in reverse order? Rename dev, clone testing on dev, make changes, click on testing, click on renamed dev, delete dev, rename renamed dev back to dev?

What is the cleanest / easiest way to do this?

Answer 1

For clarity to other readers: the actual HG shelve team is not suitable for this situation; it does not work with the changes already made, but also does not need to be used in this case.

Here is what you can do:

1. In dev, upgrade to commits that you don't want to use for testing.
2. Make the necessary changes to dev and commit. This will create a new head (which will also become a new end).
3. Push to testing
4. In dev, merge the tip with another head that contains the changes that you avoided pressing, and then commit.

---

Original proposal (impossible to implement in this case):

1. Clone dev to new repo and upgrade to version before commits (or just testing clones)
2. Make the necessary changes, commit and click on test and dev
3. Cancel clone
4. Pull testing from testing in dev and combine your heads at your leisure by setting one head again

Answer 2

Another workflow might be: Use the MQ extension

• Enable MQ extension for repository
• Init MQ
• Converting the required change sets to MQ patches ( How do I convert N local highest commits to an MQ patch? And the topic "Converting to and from constant changes" in Chapter 12. Managing changes with Mercurial Queues in the HG book)
• Do not use all generated hg qpop -a 'fixes
• Make changes, commit, click
• Returning patches to changeets ( hg qpush -a + hg qfinish -a )