Ups, I forgot to attach the file. Here it is :)
2014-09-16 14:56 GMT+02:00 Damla Durmaz <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>:
>
> 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?
>>
>> o If no: Pull the master and the development/actionAwareness branch
>> from Gerrit. This will result in a fast-forward.
>>
>> o If 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]
>> *Sent:* Tuesday, September 16, 2014 12:01 AM
>> *To:* Zieris, Franz
>> *Cc:* 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>:
>>
>> 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
>>
>>
>>
>
>
Damlas-MacBook-Air-2:saros damlisch$ git cherry-pick change/1788/7
fatal: bad revision 'change/1788/7'
Damlas-MacBook-Air-2:saros damlisch$ git cherry-pick change/1788/7
error: could not apply 65abab1... [FEATURE] Action Awareness: Show test runs
with their result
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'
Damlas-MacBook-Air-2:saros damlisch$ git status
On branch development/actionAwareness
Your branch is ahead of 'origin/development/actionAwareness' by 122 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 65abab1.
(fix conflicts and run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/AbstractActivityReceiver.java
modified:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/IActivityReceiver.java
new file:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/TestRunActivity.java
modified:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/communication/extensions/ActivitiesExtension.java
modified: de.fu_berlin.inf.dpp/META-INF/MANIFEST.MF
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/AwarenessInformationCollector.java
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/IDEInteractionActivitiesManager.java
new file:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/TestRunManager.java
new file:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/TestRunsListener.java
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/project/internal/SarosSession.java
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/SessionContentProvider.java
both modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/UIAwarenessTreeElement.java
Damlas-MacBook-Air-2:saros damlisch$ git add *
Damlas-MacBook-Air-2:saros damlisch$ git status
On branch development/actionAwareness
Your branch is ahead of 'origin/development/actionAwareness' by 122 commits.
(use "git push" to publish your local commits)
You are currently cherry-picking commit 65abab1.
(all conflicts fixed: run "git cherry-pick --continue")
(use "git cherry-pick --abort" to cancel the cherry-pick operation)
Changes to be committed:
modified:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/AbstractActivityReceiver.java
modified:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/IActivityReceiver.java
new file:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/TestRunActivity.java
modified:
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/communication/extensions/ActivitiesExtension.java
modified: de.fu_berlin.inf.dpp/META-INF/MANIFEST.MF
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/AwarenessInformationCollector.java
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/IDEInteractionActivitiesManager.java
new file:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/TestRunManager.java
new file:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/TestRunsListener.java
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/project/internal/SarosSession.java
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/SessionContentProvider.java
modified:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/UIAwarenessTreeElement.java
Damlas-MacBook-Air-2:saros damlisch$ git cherry-pick --continue
[development/actionAwareness 0d85876] [FEATURE] Action Awareness: Show test
runs with their result
12 files changed, 792 insertions(+), 80 deletions(-)
create mode 100644
de.fu_berlin.inf.dpp.core/src/de/fu_berlin/inf/dpp/activities/TestRunActivity.java
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/TestRunManager.java
create mode 100644
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/awareness/TestRunsListener.java
Damlas-MacBook-Air-2:saros damlisch$ git status
On branch development/actionAwareness
Your branch is ahead of 'origin/development/actionAwareness' by 123 commits.
(use "git push" to publish your local commits)
nothing to commit, working directory clean
Damlas-MacBook-Air-2:saros damlisch$ git push origin
refs/for/development/actionAwareness
error: src refspec refs/for/development/actionAwareness does not match any.
error: failed to push some refs to
'ssh://dil...@saros-build.imp.fu-berlin.de:29418/saros.git'
Damlas-MacBook-Air-2:saros damlisch$ git log
commit 0d858761130fb7793d73ac1449c4fee7c6450323
Author: Damla Durmaz <ddurma...@gmail.com>
Date: Fri Jul 4 17:20:37 2014 +0200
commit 0d858761130fb7793d73ac1449c4fee7c6450323
Author: Damla Durmaz <ddurma...@gmail.com>
Date: Fri Jul 4 17:20:37 2014 +0200
[FEATURE] Action Awareness: Show test runs with their result
This feature tracks test runs of session participants and sends the
title and the result of started and finished test runs to the other
participants of the session.
The information is displayed in the new DialogAwarenessTreeElement,
introduced by the new action awareness feature, see:
http://saros-build.imp.fu-berlin.de/gerrit/#/c/1572/
Additionally, the awareness information is printed in the multi user
chat and in the status line of the Eclipse workbench. This is done for
further user experiments to investigate, which place is the preferred
one for action awareness information. This can be configured in the
saros-properties file. Currently, just the roster is configured to
display the awareness information.
Change-Id: Ifff8311bbfc35839c3dc6d15418a4daba7dc3fb5
Conflicts:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/SessionContentProvider.java
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/UIAwarenessTreeElement.java
commit efc5047426fb3f700e9c9c096d5f7274c49b4a88
Merge: be5e0e4 153803f
Author: Damla Durmaz <ddurma...@gmail.com>
Date: Tue Sep 16 14:35:31 2014 +0200
[BUILD] Merge master into development/actionAwareness
Conflicts:
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/SessionContentProvider.java
de.fu_berlin.inf.dpp/src/de/fu_berlin/inf/dpp/ui/model/session/UserElement.java
Change-Id: Ie1d74938c99b61aa33c73f3bee94119cd72eee9a
commit 153803f1e3f989bb56187e4728a29df9d64a164b
Author: Stefan Rossbach <srossb...@arcor.de>
Date: Wed Sep 3 16:04:24 2014 +0200
Damlas-MacBook-Air-2:saros damlisch$
------------------------------------------------------------------------------
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
