…so I’ve gotten used to the simple stuff with Mercurial (add, commit, diff) and found out about the .hgignore file (yay!) and have gotten the hang of creating and switching between branches (branch, update -C).
I have two major questions though:
-
If I’m in branch ‘Branch1’ and I want to pull in some but not all of the changes from branch ‘Branch2’, how would I do that? Particularly if all the changes are in one subdirectory. (I guess I could just clone the whole repository, then use a directory-merge tool like Beyond Compare to pick&choose my edits. Seems like there ought to be a way to just isolate the changes in one file or one directory, though.)
-
Switching between branches with
update -Cseems so easy, I’m wondering why I would bother usingclone. I can only think of a few reasons (see below) — are there some other reasons I’m missing?a. if I need to act on two versions/branches at once (e.g. do a performance-metric diff)
b. for a backup (
clonethe repository to a network drive in a physically different location)c. to do the pick&choose merge like I’ve mentioned above.
I use clone for:
The former use is pretty rare for me – mainly when I’m trying an idea I might want to totally abandon. If I want to merge, I’ll want to merge ALL the changes. This sort of branching is mainly for tracking different developers’ branches so they don’t disturb each other. Just to clarify this last point:
For feature branches, or longer lived branches, I use named branches which are more comfortably shared between repositories without merging. It also ‘feels’ better when you want to selectively merge.
Basically I look at it this way:
That’s my take, though really it’s a matter of policy.