Hi Franz,
Thank you for your answer. I tried out the steps on the workspace state
like in the screenshot. As I executed the third step
--> git merge master -m “[BUILD] Merge master into
development/actionAwareness”
I got the message
--> merge: Merge - not something we can merge
What does this mean?
Damla
2014-09-15 21:57 GMT+02:00 Franz Zieris <franz.zie...@fu-berlin.de>:
> Hi Damla,
>
>
>
> There are actually two problems: The length of the commit’s short message
> is a minor one (Gerrit says “W” for warning) and does not affect the
> “pushability” of your patch. The actual problem is that you created a new
> version/patch set of change 1572, which Gerrit won’t accept since this
> patch is already closed.
>
>
>
> The cause for this is probably that you forgot that you are developing
> your feature on a separate branch. The parent change 1572 is already
> submitted to that branch, but it is not part of the master branch. You
> should merge the current master into your development branch and then apply
> your most recent version of 1788 to that state.
>
>
>
> One way to achieve this (based on your screenshot):
>
> * git fetch origin development/actionAwareness
>
> * git checkout -B actionAwareness origin/development/actionAwareness
>
> * git merge master -m “[BUILD] Merge master into
> development/actionAwareness”
>
> * git cherry-pick change/1788/7
>
> * git push origin refs/for/development/actionAwareness
>
>
>
> Refer to the Git manual if you have any questions regarding these commands
> (http://git-scm.com/docs) or just ask here on the mailing list.
>
>
>
> Franz
>
>
>
> *From:* Damla Durmaz [mailto:ddurma...@gmail.com]
> *Sent:* Monday, September 15, 2014 9:19 PM
> *To:* dpp-devel@lists.sourceforge.net
> *Subject:* [DPP-Devel] Commit message longer than 65 characters?
>
>
>
> Dear Saros developers,
>
>
>
> I am struggling with git and don't know how to get along with the
> following situation:
>
>
>
> I have my patch 1788 [1] and wanted to rebase it against master, because
> it is a bit...old.... Therefore, I pulled the newest master branch and
> rebased against the local master branch, made some changes, needed for the
> rebase and then committed everything. As I wanted to push, I got the
> message in the screenshot below, thus that the commit message is too long.
> But the reject message refers to the parent of patch 1788, which is already
> merged.
>
>
>
> What am I doing wrong?
>
>
>
> Cheers,
>
> Damla
>
>
>
> [1] http://saros-build.imp.fu-berlin.de/gerrit/#/c/1788/7
>
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
DPP-Devel mailing list
DPP-Devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dpp-devel
