Dear Ariel,
I am having some trouble submitting the patches. On-line examples
that I have seen do not cover the case of submitting patches to a
branch. Here is what I have tried so far:
0) clone, hooks, and review setup
(shell) git clone ssh://wpmirrordev@gerrit.wikimedia.org:29418/operations/dumps
(shell) scp -p -P 29418
wpmirrordev@gerrit.wikimedia.org:hooks/commit-msg ~/dumps/.git/hooks/.
(shell) cd dumps
(shell) git review -s
(shell) git status
1) pull the ariel branch
(shell) git pull origin master
(shell) git branch ariel
(shell) git pull origin ariel # throws errors
(shell) git status # emits a long list of revisions
2) commit
(shell) git commit -a # needed to quell errors from the `pull'
(shell) git checkout ariel
(shell) git status
3) create branch for the patches
(shell) git branch wpmirrordev master
(shell) git checkout wpmirrordev
(shell) git status
4) apply patches
(shell) cp ../patched-files/* xmlfileutils/.
(shell) git diff
(shell) git status
5) commit the patches
(shell) cd xmlfileutils
(shell) git add mwxml2sql.c sql2txt.c sqlfilter.c Makefile
(shell) git diff --cached
(shell) git commit
(shell) git status
6) rebase
(shell) git pull origin master
(shell) git rebase master
(shell) cat .gitreview
gerrit]
host=gerrit.wikimedia.org
port=29418
project=operations/dumps.git
<<<<<<< HEAD
defaultbranch=master
=======
defaultbranch=ariel
>>>>>>
3b82bbea24f999f1a5af721d37ec0684615bc3ae
(shell) git checkout ariel # need to fix
error in .gitreview
7) submit for review
(shell) review -R ariel
Enter passphrase for key '/home/wikimedia/.ssh/id_rsa':
Creating a git remote called "gerrit" that maps to:
ssh://wpmirrordev@gerrit.wikimedia.org:29418/operations/dumps.git
Enter passphrase for key '/home/wikimedia/.ssh/id_rsa':
You have more than one commit that you are about to submit.
The outstanding commits are:
bf268a2 (HEAD, origin/master, origin/HEAD, gerrit/master, ariel) pep8
whitespaces fixing
6dff615 pep8: E302 expected 2 blank lines, found 1
671beaa .pep8 configuration file
1235eaa Merge "Add .gitreview file"
9a814c2 README is obsolete :(
67a61fa Add .gitreview file
47b6db7 add CC-BY_SA license for text, plus pointer to terms of use
689fa7c dump iwlinks table
e4bc572 Kill .cvsignore, svn ignore is doing the same
25f4a46 svn:eol-style native
Is this really what you meant to do?
Type 'yes' to confirm: yes
Enter passphrase for key '/home/wikimedia/.ssh/id_rsa':
X11 forwarding request failed on channel 0
remote: Processing changes: refs: 1, done
To ssh://wpmirrordev@gerrit.wikimedia.org:29418/operations/dumps.git
! [remote rejected] HEAD -> refs/publish/ariel/ariel (no new changes)
error: failed to push some refs to
'ssh://wpmirrordev@gerrit.wikimedia.org:29418/operations/dumps.git'
make: *** [review] Error 1
wikimedia@darkstar-7:~$ QDBusConnection: session D-Bus connection
created before QCoreApplication. Application may misbehave.
QDBusConnection: session D-Bus connection created before
QCoreApplication. Application may misbehave.
QSystemTrayIcon::setVisible: No Icon set
Connecting to deprecated signal
QDBusConnectionInterface::serviceOwnerChanged(QString,QString,QString)
Any help is welcome.
Sincerely Yours,
Kent