Sorry for that comment but:
Damla and GIT: An endless "Love" Story :P
On 16.09.2014 15:31, Damla Durmaz wrote:
Hm :/ It is saying the same again. That I am not allowed to merge
anything.
Damla
2014-09-16 15:25 GMT+02:00 Zieris, Franz <franz.zie...@fu-berlin.de
<mailto:franz.zie...@fu-berlin.de>>:
Alright, we are getting there.
I gave you the "push merge commit" right for your development
branch, so the same command should work now.
Franz
*From:*Damla Durmaz [mailto:ddurma...@gmail.com
<mailto:ddurma...@gmail.com>]
*Sent:* Tuesday, September 16, 2014 3:19 PM
*To:* Zieris, Franz
*Cc:* dpp-devel@lists.sourceforge.net
<mailto:dpp-devel@lists.sourceforge.net>
*Subject:* Re: [DPP-Devel] Commit message longer than 65 characters?
No problem. Now, git says that it cannot merge due to permissions:
Damlas-MacBook-Air-2:saros damlisch$ git push origin
HEAD:refs/for/development/actionAwareness
Counting objects: 170, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (46/46), done.
Writing objects: 100% (66/66), 9.46 KiB | 0 bytes/s, done.
Total 66 (delta 37), reused 0 (delta 0)
remote: Resolving deltas: 100% (37/37)
remote: Processing changes: refs: 1, done
To ssh://dil...@saros-build.imp.fu-berlin.de:29418/saros.git
<http://dil...@saros-build.imp.fu-berlin.de:29418/saros.git>
! [remote rejected] HEAD -> refs/for/development/actionAwareness
(you are not allowed to upload merges)
error: failed to push some refs to
'ssh://dil...@saros-build.imp.fu-berlin.de:29418/saros.git
<http://dil...@saros-build.imp.fu-berlin.de:29418/saros.git>'
Damlas-MacBook-Air-2:saros damlisch$
I need merge commit permissions. Are these branch specific or for
the whole saros project?
Cheers,
Damla
2014-09-16 15:13 GMT+02:00 Zieris, Franz
<franz.zie...@fu-berlin.de <mailto:franz.zie...@fu-berlin.de>>:
Sorry ...
> git push origin refs/for/development/actionAwareness
should be
> git push origin HEAD:refs/for/development/actionAwareness
The error message basically says "locally, there is nothing
like 'refs/for/development/actionAwareness', so I don't know
what you want me to push".
Franz
*From:*Damla Durmaz [mailto:ddurma...@gmail.com
<mailto:ddurma...@gmail.com>]
*Sent:* Tuesday, September 16, 2014 3:09 PM
*To:* Zieris, Franz
*Cc:* dpp-devel@lists.sourceforge.net
<mailto:dpp-devel@lists.sourceforge.net>
*Subject:* Re: [DPP-Devel] Commit message longer than 65
characters?
Ups, I forgot to attach the file. Here it is :)
2014-09-16 14:56 GMT+02:00 Damla Durmaz <ddurma...@gmail.com
<mailto:ddurma...@gmail.com>>:
Hi Franz,
It didn't work :(. I will describe my steps in detail, so
that you can see, where the problems may be. At the
beginning, I just have the master branch checked out and
nothing committed, changed and so on. Everything is clean.
Then:
1) I pull the master
2) I check out development/actionAwareness
3) I pull development/actionAwareness
4) git checkout development/actionAwareness
5) git log --graph --decorate --oneline master
development/actionAwareness --> was like you described
6) git merge master -m "[BUILD] Merge master into
development/actionAwareness" --> I had conflicts
7) I resolved the conflicts and made a commit with the
appropriate message from above
8) git cherry-pick change/1788/7 --> I had conflicts. I
solved them, continued the cherry pick
9) git push origin refs/for/development/actionAwareness
--> Won't work, since it says that it doesn't match anything
I attached the output of my console from the step when I
cherry picked. The log shows me that I correctly merged in
the master branch, but 'git status' says that I am 123
commits back. I made a pull but this didn't work either.
Damla
2014-09-16 11:07 GMT+02:00 Zieris, Franz
<franz.zie...@fu-berlin.de
<mailto:franz.zie...@fu-berlin.de>>:
Hi Damla,
Hm, maybe I got your current repository state wrong.
The full procedure is this (assuming you have the two
local branches "master" and
"development/actionAwareness"):
·Do your local branches "master" and
"development/actionAwareness" contain any
not-yet-public commits?
oIf no: Pull the master and the
development/actionAwareness branch from Gerrit. This
will result in a fast-forward.
oIf yes: Just fetch the master and the
development/actionAwareness branch from Gerrit.
Checkout your local master branch, decide whether the
not-yet-public commits are worth keeping (if so, "git
branch oldMaster") and then "git reset --hard
origin/master". Repeat for the development branch.
·git checkout development/actionAwareness
·git log --graph --decorate --oneline master
development/actionAwareness
You can use the up/down arrows for scrolling (it's
been a while since the dev branch did branch off).
If you see a long master branch and a tiny dev branch
attached to its trunk, then you can continue.
Otherwise, please show me the output.
·git merge master -m "[BUILD] Merge master into
development/actionAwareness"
·git cherry-pick change/1788/7
·git push origin refs/for/development/actionAwareness
Franz
*From:*Damla Durmaz [mailto:ddurma...@gmail.com
<mailto:ddurma...@gmail.com>]
*Sent:* Tuesday, September 16, 2014 12:01 AM
*To:* Zieris, Franz
*Cc:* dpp-devel@lists.sourceforge.net
<mailto:dpp-devel@lists.sourceforge.net>
*Subject:* Re: [DPP-Devel] Commit message longer than
65 characters?
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
<mailto: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
<mailto:ddurma...@gmail.com>]
*Sent:* Monday, September 15, 2014 9:19 PM
*To:* dpp-devel@lists.sourceforge.net
<mailto: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
------------------------------------------------------------------------------
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
