[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [egit-dev] Logical model support for merge operations
|
Hi Robin,
On 18/07/2014 23:05, Robin Rosenberg wrote:
----- 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.
We have fallen back to providing custom builds of EGit enhanced with
these pending patchs for now, so that our clients can test the model
support and use it in their own workflows, which also mean that they can
raise bugs against it, triggering more work that will eventually become
reviews on the project. Even though I had managed to avoid it so far,
with 11 reviews I was bound to come to a scenario where I need to create
a new review re-using utilities or functionalities introduced by two
unrelated ones (since I try to keep the dependencies to a minimum).
Trying to make this new change independent (or dependent on a single
"line" of changes) will introduce a lot of duplication between reviews,
which will need yet another one to remove the duplication afterwards...
Seems suboptimal as it will also create more work for the reviewers.
I'll try nonetheless.
Laurent
begin:vcard
fn:Laurent Goubet
n:Goubet;Laurent
org:<a href="http://www.obeo.fr";>Obeo</a>
email;internet:laurent.goubet@xxxxxxx
url:http://www.obeo.fr
version:2.1
end:vcard
