Re: [egit-dev] Logical model support for merge operations

[Robin Rosenberg <robin.rosenberg@xxxxxxxxxx>]

----- Ursprungligt meddelande -----
> Från: "Laurent Goubet" <laurent.goubet@xxxxxxx>
> Till: egit-dev@xxxxxxxxxxx
> Skickat: fredag, 18 jul 2014 17:15:43
> Ämne: Re: [egit-dev] Logical model support for merge operations
> 
> Hi Travis,
> 
> The changes needed into JGit for this support have now been merged, but
> all changes regarding EGit are still pending.
> 
> On that matter, I was working on unit tests to try and demonstrate what
> we are doing, and what some of these are needed. However, even though I
> can now write them (had quite a lot of trouble with maven getting in the
> way), they depend on unrelated changes.

This happens sometimes. If that unrelated change is not wanted, it would
block submission, otherwise it's sort-of ok, though not perfect. The more
dependent patches you have, the slower progress will be. If you are in a hurry,
create independent patches.

> Namely, to demonstrate why failing the process as a whole when the
> auto-staging hook cannot lock the index https://git.eclipse.org/r/22670
> , I also need the changes introduced by https://git.eclipse.org/r/22671
> and https://git.eclipse.org/r/22674 since I cannot otherwise show the
> complete use case.
> 
> Should i make the two latter dependent on the otherwise unrelated first
> in order to push the unit tests for review? For the record, I'm
> attaching here one such unit test, that will fail if commited atop 22671
> and 22674, but work if 22670 is also merged beforehand. (i.e. it fails
> because the auto-staging hook crashes.)

-- robin