Re: [recommenders-dev] Change in recommenders/org.eclipse.recommenders[m

[Chen Cheng <chengchendoc@xxxxxxxxx>]

Ok, i will rebase and resubmit the patch. And prevent this situation by feature branches next time :-)

2012/4/30 Marcel Bruch <marcel.bruch@xxxxxxxxx>

Don't wait too long ;) The error message shows what's wrong.

Update your local repository (i.e., rebase your changes) and resubmit the patch. 

Gerrit considers subsequent commits as dependent on each other and have to be approved in order. This can be omitted when using feature branches next time.

HTH

Marcel

On 30.04.2012, at 07:08, Chen Cheng wrote:

Gerrit told us about this:

Gerrit Code Review                12:43 PM
Change cannot be merged due to unsatisfiable dependencies.
The following dependency errors were found:
Depends on patch set 2 of Ibde4ca85, however the current patch set is 3.
Please rebase the change and upload a replacement commit. 

So, Does it mean submit a new patchset for this change (https://git.eclipse.org/r/#/c/5689/) is the only solution?  

Waiting for your answer, Marcel :-)

2012/4/30 Doug Wightman <douglasw@xxxxxxxxx>

Hmm. We seem to be tying ourselves in knots. Marcel - can you advise
on the best way to resolve this? Chen and I aren't certain. We
considered just creating a new patch, then thought to consult with you
first.

Thanks :)

Doug

On Mon, Apr 30, 2012 at 12:43 AM, Marcel Bruch (Code Review)
<gerrit@xxxxxxxxxxx> wrote:
> Marcel Bruch has submitted this change and it FAILED to merge.
>
> Change subject: [snipmatch] Local search module interface define for SnipMatch
> ......................................................................
>
>
> Change cannot be merged due to unsatisfiable dependencies.
>
> The following dependency errors were found:
>
> * Depends on patch set 2 of Ibde4ca85, however the current patch set is 3.
>
> Please rebase the change and upload a replacement commit.
>
> --
> To view, visit https://git.eclipse.org/r/5689
> To unsubscribe, visit https://git.eclipse.org/r/settings
>
> Gerrit-MessageType: merge-failed
> Gerrit-Change-Id: I38a4926f6e5cbc7499cb49c832551c2996b97ed1
> Gerrit-PatchSet: 1
> Gerrit-Project: recommenders/org.eclipse.recommenders
> Gerrit-Branch: master
> Gerrit-Owner: Cheng Chen <chengchendoc@xxxxxxxxx>
> Gerrit-Reviewer: Doug Wightman <douglasw@xxxxxxxxx>
> Gerrit-Reviewer: Marcel Bruch <bruch@xxxxxxxxxxxxxxxxxxxxxxxxxxxxx>

_______________________________________________
recommenders-dev mailing list
recommenders-dev@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/recommenders-dev

--
Best Regards From Cheng Chen [chengchendoc@xxxxxxxxx]

_______________________________________________
recommenders-dev mailing list
recommenders-dev@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/recommenders-dev

_______________________________________________
recommenders-dev mailing list
recommenders-dev@xxxxxxxxxxx
http://dev.eclipse.org/mailman/listinfo/recommenders-dev

-- 
Best Regards From Cheng Chen [chengchendoc@xxxxxxxxx]