Philipp Lohmann <Philipp.Lohmann <at> Sun.COM> writes: > Which would make it unsuitable for integration. So how do I get rid of > multiple heads "on the server" again ? Up to now I took the warning > "would create multiple heads" as a queue, pulled and merged locally and > then pushed. Well, you can just "push -f" thereby creating a new head "on the server". To merge the heads "on the server", pull the heads, merge them locally and commit back. As a "head" is simply defined as changeset without children pushing the merge changeset (having both of the old "heads" as parent) eliminates the additional head (and mercurial will report so, when you push the merge changeset).
In the end, there is little difference between: - trying to push and aborting because it would create a new head - pulling - merging heads locally - pushing and: - push -f and noticing one just created a new head - pulling - merging heads locally - pushing Its only different between the two pushes, but after the second push the repo has the same state. Note, that you might not want to immediately merge the heads (for example, in the scenario described before you might want to see if there are more buildbreakers on one platform and do the merge after all have been found). So the advantage with just creating heads on the server is that you are free to merge the heads whenever it suits you well. Have Fun, Bjoern --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
