1

I'm a solo hobbyist developer with some code hosted on Bitbucket. I use TortoiseHg client-side for managing my repo.

Back in 2013 I developed a feature on a branch but abandoned it before completion.

The default branch has seen many commits and structural improvements since that time.

Now I'm to a point where that abandoned branch's feature has become appealing again, and I'd like to resume working on it.

First, however, I'd like to bring it up to compliance with the existing site design.

I'm unclear on what the correct Mercurial step is for reviving this branch? It seems obvious that I don't want to Merge with Local... with local being the most recent default code. Update to... would pull the most recent commit from the old branch down to my computer, which wouldn't have any of the system-wide improvements made over the intervening years. So?

Drew
  • 1,283

1 Answers1

1

You want (in common) merge default to feature (resolving a lot of possible merge-conflicts).

Slightly different way:

  • convert all changesets of feature branch into the set of MQ-patches
  • create new named branch from current tip
  • Apply patches from queue consecutively from bottom to top, resolving conflicts for every single changeset's changes

PS: As @IMSoP noted, instead of MQ-game it can be just rebase (feature branch to the fresh branchpoint), it's just a question of tastes: resolve (possible) conflicts for final states of conflict-ranges in case of rebase (imagine more than single change in range in conflict in revset) or resolve it in sequence individually for each changeset, which produced merge-conflict

Lazy Badger
  • 1,937