[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [egit-dev] Cherry-pick & Gerrit Change-ID
- From: Matthias Sohn <matthias.sohn@xxxxxxxxxxxxxx>
- Date: Wed, 21 Dec 2011 09:46:51 +0100
- Delivered-to: email@example.com
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=kjZs+7/fs2ElyWgGXRLThBArP3iKJI3iR0QH3R2yU/o=; b=oCgBxMEK+wQvdMdNt/cw+eeScnHJYvH84DD+nwXOPOp/5haK2LtzaxblOgJiWi2esJ qkFUf8BbHzznELYaOm9iilcthGuBgPSvSdgQWtGuAWY4Eu7biSJInCCPfg1+TPNmtqiz VkBFmCjVsgGnOkBY0fkYwUeMIMHQiaCbsFi/4=
2011/12/21 Markus Duft <markus.duft@xxxxxxxxxx>
How should the gerrit change-id generation in egit behave when cherry-picking a commit to another branch? I observed:
Â* when there is no conflict, the same id is used
Â* when there is a conflict and i have to use the commit dialog, a new id is generated
is this intention? or should i report a bug?
this looks inconsistent and is probably caused by the fact that
change-id generation is a feature of the commit dialog which isn't
used when cherry-pick succeeds without conflicts.
Though I am not sure what's the correct behavior as AFAIK Gerrit behavior
changed from 2.1.x to 2.2. I think Gerrit 2.1.x rejects pushing changes with
the same change-id to multiple branches whereas Gerrit 2.2 now
can handle that.Â
@Sasa: am I right here ? Any hints ?