On Wed, Mar 25, 2015 at 09:15:52AM +0100, Dario Lombardo wrote:
> Since you now have 2 changes submitted, you should abandon one of them (do
> it from the web interface), then follow Alexis' suggestion about sqashing
> and amending, then push the final revision into the survived change (do it
> using the correct change-id, read it from the web interface again).
>
> I don't know what happens if one push a change-x from a branch b1, then
> push the same change-x from another branch b2. Maybe the latter overwrites
> the first in gerrit? Anyone tried it?
It is a valid use to have the same change-id in different branches. It
makes it possible to easily find backports that way, for example. If a
change was posted to the wrong upstream branch in Gerrit, you will need
to abandon that change and post it to the correct branch.
Posting a patch with a change-id that is already in a different branch,
will not overwrite/abandon the already existing patch.
HTH,
Niels
>
> On Wed, Mar 25, 2015 at 7:10 AM, Anil <anilkumar911@xxxxxxxxx> wrote:
>
> > Hi All --
> >
> > I have done a mistake with submitting code for review.
> >
> > My initial review is https://code.wireshark.org/review/#/c/7751
> > <https://code.wireshark.org/review/#/c/7751/1/epan/dissectors/packet-nstrace.c>
> >
> > I fixed the issues reported there and have checked in the new changes. The
> > problem is that the new changes are in a different branch than the original
> > one. So it has created a new review
> > https://code.wireshark.org/review/#/c/7802/
> >
> > I need some help about what can be done now ?
> >
> > --Anil
> >
> > ___________________________________________________________________________
> > Sent via: Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> > Archives: https://www.wireshark.org/lists/wireshark-dev
> > Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
> > mailto:wireshark-dev-request@xxxxxxxxxxxxx
> > ?subject=unsubscribe
> >
> ___________________________________________________________________________
> Sent via: Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
> Archives: https://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
> mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe
