Strategies for push/merge problem?

Douglas Philips dgou at mac.com
Wed Jul 16 08:48:32 CDT 2008


On or about 2008 Jul 16, at 4:57 AM, Martin Geisler indited:
> I think of changesets as database transactions: they make an atomic
> change and bring the repository from one "correct" state to another.
> Its up to the user to decide what "correct" means, but taking it to
> mean that the test suite passes is a logical choice, IMHO.

Yes, that is a policy decision. The fact that said policy so reeks of  
CVSes commit == push is one reason I like Hg's ability to have  
alternative policies...

> As long as the changes does not overlap, then a combination of
> qpush/qpop and qrecord should for fine.

yes, its the last 10% (that I covet) which takes the other 270% of the  
work. But maybe it isn't as involved as it seems... Hmm....

--Doug



More information about the Mercurial mailing list