CODEWITHSUNDEEP
mergemercurial
Konstantin Lopuhin
Konstantin Lopuhin

Reputation: 124

Merging two branches in both directions in mercurial

I would like to support the following situation:

I tried to do a dummy merge as described here, first in one direction, then after several successful merges, in another direction (dummy merge of dummy merge). Now I need to do a merge again in another direction, and here another dummy merge (of dummy merge of dummy merge) does not help me any more (and I hoped that one dummy merge would be enough anyway).

Is it possible to do development in this fashion, or is it better to do most of development in one branch? (well, I know it is better for hg, but I have reasons)

Upvotes: 0

Views: 127

Answers (1)

Lazy Badger
Lazy Badger

Reputation: 97270

Preface

If both branches share the same functionality (unstable common DEVEL), I can't see any reasons in such splitting, except added headache

Face

You can avoid merging unwanted changeset from one branch into another and use ordinary merge if you'll convert this mergeset into MQ-patch ( or maybe shelveset) and always merge from|to (read "Merging patches with new upstream revisions" for merging to branch hint) branch with unapplied patch

Upvotes: 1

Related Questions