Merge on push?

Giorgos Keramidas keramida at ceid.upatras.gr
Sat Jun 7 17:04:26 CDT 2008


On Sat, 07 Jun 2008 21:39:33 +0200, Roman Kennke <roman.kennke at aicas.com> wrote:
> I'd like to propose an extension to the push command. I imagine an
> option --merge and maybe a configuration option for use in ~/.hgrc
> which makes push try a merge on the remote side if necessary. hg push
> --merge would then try to perform a non-interactive merge and commit
> on the remote repository, when the push would create an additional
> head. This should fail when the changes touch files that have been
> touched by other changesets since their 'branch-point'. This is more
> or less the behaviour of more traditional RCSes. I know, there is a
> chance that this results in a broken tree even when there are no
> overlapping changes, but experience with more traditional RCSes (CVS
> and Subversion, maybe other DRCSes, dunno about them) shows that such
> cases are very rare in a reasonable structured project.

Broken trees are *far* more annoying than "you need to merge" warnings,
and I don't see how `hg push --merge' can do anything sensible about
conflicts :-(



More information about the Mercurial mailing list