Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] Merge in 0.9?

2010/8/26 Robin Rosenberg <robin.rosenberg@xxxxxxxxxx>
torsdagen den 26 augusti 2010 21.38.20 skrev  Shawn Pearce:
> On Thu, Aug 26, 2010 at 9:38 AM, Chris Aniszczyk <caniszczyk@xxxxxxxxx>
> > On Thu, Aug 26, 2010 at 10:13 AM, Christian Halstrick
> >
> > <christian.halstrick@xxxxxxxxx> wrote:
> >> The 0.9 release is coming closer fast. We have to decide whether we
> >> want the resolve merger in or not.
> We do.
> >> The resolve merger is in change [2] and needs [1]. I think the
> >> enhancement for merge without
> >> workingtree discussed in [3] should be done incrementally on top.
> I agree, this is a good direction forward.
> >> I am reasonably happy to submit DirCacheCheckout for 0.9. The Resolve
> >> Merger looks good to me
> >> but I would love to get it reviewed before including it in 0.9.
> >>
> >> [1],825 (DirCacheCheckout)
> >> [2],1226 (Resolve Merger)
> >> [3]
> >
> > I will do my best to review it this week. I believe we should include
> > it in our 0.9 builds soon so we can dog food it and use it to make
> > sure it's solid.
> Great, thanks Chris.  I'll try to give it another read myself.  But
> please don't wait for me to submit, the last few revisions I have seen
> looked pretty reasonable to me and I had the impression that we were
> down to hard to find bugs which are elusive even during code reviews,
> so I'd rather get this in the tree sooner so we have time to test in
> more real-world cases.

It was mostly about thinking hard about some of the tests and what the result
should really be and checkout is worst thing we have to test and figure out
what is the right thing to do.

I think it would be a good idea to write down the decision matrix for checkout
we discussed in the last weeks over and over again to make the current findings 
as clear as possible. This will help to refine it in case we missed some corner cases.


Back to the top