On 13/05/2011 11:25, Ian Lynagh wrote:
On Thu, May 12, 2011 at 12:33:23PM +0100, Simon Marlow wrote:
I suppose sync-all pull would be a reasonable default, but it *must*
be --ff-only, I don't want validate generating any commits.
Doesn't that mean that it would only do anything if you have made no
changes?
Or do you mean it should just fail if there's anything to pull?
It will fail if there is anything to pull *and* you have a local commit
or uncommitted local changes in that repo. Then you have to decide how
to merge and do it by hand.
Cheers,
Simon
_______________________________________________
Cvs-ghc mailing list
Cvs-ghc@haskell.org
http://www.haskell.org/mailman/listinfo/cvs-ghc