Mercurial: Merging one file between branches in one repo

by

WARNING: a “dummy merge”, as is recommended by @Martin_Geisler, can really mess you up, if later you want to do a true merge of the two branches. The dummy merge will be recorded, and say that you merge into the branch you did the dummy merge to — you will not see the changes. Or if you merge into the other branch, the changes on that other branch will be undone.

If all you want is to copy an entire file from one branch to another, you can simply do:

   hg update -r to-branch
   hg revert -r from-branch file
   hg ci -m 'copied single file from from-branch to to-branch

If you want to select different parts of that file, then "hg record" is useful.

I just did this on my home directory .hgignore.

If both branches have made changes to a file that you want to keep, a dirty trick would be to create a merge of the two branches using hg merge, possibly/probably on still another branch, check that in, and then copy a single file between the merge and the to-branch:

   hg update -r to-branch
   branch merge-branch
   hg merge -r from-branch
   hg ci -m 'temp merge to be discarded"
   hg update -r to-branch
   hg revert -r merge-branch single-file
   hg ci -m 'merged single-file from from-branch to to-branch"
   hg strip merge-branch

It is worth mentioning: the way to “copy a single file between branches” (or revisions, or from revision to merge, or….) is “hg revert”. I.e.

   hg update -r Where-you-want-to-copy-to
   hg revert -r Where-you-want-to-copy-from file-you-want-to-copy
   ...
   hg ci

For some reason I, and some of my coworkers, find this VERY confusing. “revert”==”copy” … makes sense for some usage patterns, but not all.

More Related Contents:

  1. Named Branches vs Multiple Repositories
  2. Mercurial — revert back to old version and continue from there
  3. Source Control – Distributed Systems vs. Non Distributed – What’s the difference?
  4. Distributed Version Control Systems and the Enterprise – a Good mix? [closed]
  5. Git and Mercurial – Compare and Contrast
  6. What is the Difference Between Mercurial and Git?
  7. Git interoperability with a Mercurial Repository
  8. What’s the best three-way merge tool? [closed]
  9. Mercurial for Beginners: The Definitive Practical Guide
  10. Mercurial Subrepos – How do you create them and how do they work?
  11. How to edit incorrect commit message in Mercurial? [duplicate]
  12. What’s the easiest way to commit and push a single file while leaving other modifications alone?
  13. Mercurial: How to ignore changes to a tracked file
  14. Comparison between Centralized and Distributed Version Control Systems [closed]
  15. What is the difference between hg forget and hg remove?
  16. What makes merging in DVCS easy?
  17. How do you maintain development code and production code? [closed]
  18. What is the cleverest use of source repository that you have ever seen?
  19. git push to multiple repositories simultaneously [duplicate]
  20. IntelliJ IDEA 9/10, what folders to check into (or not check into) source control?
  21. Why is branching and merging easier in Mercurial than in Subversion?
  22. Storing third-party libraries in source control
  23. Is version control (ie. Subversion) applicable in document tracking? [closed]
  24. Locking binary files using git version control system
  25. How do I perform a recursive checkout using ClearCase?
  26. Is there a way to keep Hudson / Jenkins configuration files in source control?
  27. How does git track source code moved between files?
  28. How to find untracked files in a Perforce tree? (analogue of svn status)
  29. Code version change “rules” [closed]
  30. What is the difference between all the different types of version control?

Leave a Comment