What’s the easiest way to commit and push a single file while leaving other modifications alone?

by

It’s been almost 2 years since I originally posed this question. I’d do it differently now (as I mentioned in a comment above the question above). What I’d do now would be to instead commit my changes to the one file in my local repo (you can use the hg record extension to only commit pieces of a file):

hg commit -m "commit message" filename

Then just push out.

hg push

If there’s a conflict because other changes have been made to the repo that I need to merge first, I’d update to the parent revision (seen with “hg parents -r .” if you don’t know what it is), commit my other changes there so I’ve got 2 heads. Then revert back to the original single file commit and pull/merge the changes into that version. Then push out the changes with

hg push --rev .

To push out only the single file and the merge of that revision. Then you can merge the two heads you’ve got locally.

This way gets rid of the mq stuff and the potential for rejected hunks and keeps everything tracked by source control. You can also “hg strip” revisions off if you later decide you don’t want them.

More Related Contents:

  1. Why is a 3-way merge advantageous over a 2-way merge?
  2. How and/or why is merging in Git better than in SVN?
  3. What’s the best three-way merge tool? [closed]
  4. Mercurial for Beginners: The Definitive Practical Guide
  5. Named Branches vs Multiple Repositories
  6. Mercurial — revert back to old version and continue from there
  7. Mercurial Subrepos – How do you create them and how do they work?
  8. How to edit incorrect commit message in Mercurial? [duplicate]
  9. Mercurial: How to ignore changes to a tracked file
  10. Source Control – Distributed Systems vs. Non Distributed – What’s the difference?
  11. Mercurial: Merging one file between branches in one repo
  12. What is the difference between hg forget and hg remove?
  13. What makes some version control systems better at merging?
  14. How can I use ClearCase to “add to source control …” recursively?
  15. Unable to Git-push master to Github – ‘origin’ does not appear to be a git repository / permission denied
  16. Git cherry pick and datamodel integrity
  17. Updates were rejected because the remote contains work that you do not have locally
  18. Set up git to pull and push all branches
  19. Trying To Understand/Determine A Basic Git Workflow
  20. With Mercurial, how can I “compress” a series of changesets into one before pushing?
  21. What are the relative strengths and weaknesses of Git, Mercurial, and Bazaar? [closed]
  22. Is there a way to keep Hudson / Jenkins configuration files in source control?
  23. Comparison between Centralized and Distributed Version Control Systems [closed]
  24. Can you “ignore” a file in Perforce?
  25. Error “Updates were rejected because the remote contains work that you do not have locally”
  26. Do you continue development in a branch or in the trunk? [closed]
  27. TFS 2017 – how build/deliver only changed files?
  28. How to find untracked files in a Perforce tree? (analogue of svn status)
  29. Diffing between two entire directories/projects in hg or git?
  30. Code version change “rules” [closed]

Leave a Comment