On Mon, Jun 10, 2013 at 11:23:13AM +0100, Geoffrey Mainland wrote:
Side note: the fingerprint script *didn't even work* for almost a year after it was introduced; see commit 73ce2e70.
Which implies that wanting to go back in time is rare, so making it easy should be given low weight when considering the options?
3) Use subtrees.
Is this possible with subtrees?: * Initially ghc's Cabal repo is at the same commit as upstream * We make a local commit 123 in Cabal to fix some bug * Cabal upstream makes a commit 456 to fix the same bug differently * We jump to commit 456, in such a way that we don't end up merging with our 123 commit every time we pull from Cabal in the future Thanks Ian -- Ian Lynagh, Haskell Consultant Well-Typed LLP, http://www.well-typed.com/