I will assume you have the following branch setup: "master" follows "origin/master" which is the apache repository "work" is based on "master" and has all the commits with your changes in for this
When new things are pushed to the apache repo, you will want to 'git fetch; git checkout master; git merge origin/master' To operate against another diff, with the following setup: "alown" is another branch based on "master" with the commits making up my changes, Then, you will need to ensure that work is based on alown, not master using 'git rebase alown' At this point, when on "work", 'git diff master' will get you the required diff for review board, but since you are based on "alown', you also need to provide 'git diff master' when run on "alown" as the parent diff. Does this make sense? (If you don't yet grasp the power of git, do read through the first few chapters of http://git-scm.com/book) Ali On 22 December 2013 02:19, Frank R. <renfeng...@gmail.com> wrote: > I wouldn't mind. Can you show me the git commands I should execute to keep > up with you? Thank~ > > > On Sun, Dec 22, 2013 at 1:06 AM, Ali Lown <a...@lown.me.uk> wrote: > >> This is an automatically generated e-mail. To reply, visit: >> https://reviews.apache.org/r/16322/ >> >> Hmm. Well, I have now pushed the AnnotationConstants changes, so many of the >> updates you just made are now broken again :) >> >> (You could have avoided this using the parent-diff option in review board, >> and working directly on against my patch). >> >> >> - Ali Lown >> >> On December 21st, 2013, 4:38 p.m. UTC, Frank R. wrote: >> Review request for wave, Ali Lown, Vicente J. Ruiz Jurado, and Yuri >> Zelikov. >> By Frank R.. >> >> *Updated Dec. 21, 2013, 4:38 p.m.* >> *Bugs: * WAVE-311 <https://issues.apache.org/jira/browse/WAVE-311> >> *Repository: * wave >> Description >> >> For details (issues and commits):https://github.com/renfeng/wave >> >> Testing >> >> tests on search box >> >> * in:inbox >> * (empty) for all, including waves shared in the domain >> * with:@ >> * (free texts) >> >> tests on solr-bot >> >> * single word >> * phrase (quoted with double quotation marks) >> * syntax applicable to search box >> >> Diffs >> >> - .gitignore (fe1dbc9) >> - run-export.sh (d2cddb7) >> - run-import.sh (45fff8a) >> - server.config.example (19ba8b2) >> - src/com/google/wave/api/Annotation.java (b55f778) >> - src/org/waveprotocol/box/server/SearchModule.java (2de0ef9) >> - src/org/waveprotocol/box/server/ServerMain.java (b50454d) >> - src/org/waveprotocol/box/server/robots/agent/search/SolrRobot.java >> (PRE-CREATION) >> - src/org/waveprotocol/box/server/robots/agent/welcome/WelcomeRobot.java >> (2735940) >> - src/org/waveprotocol/box/server/waveserver/SimpleSearchProviderImpl.java >> (ee7093f) >> - src/org/waveprotocol/box/server/waveserver/SolrSearchProviderImpl.java >> (PRE-CREATION) >> - src/org/waveprotocol/box/server/waveserver/SolrWaveIndexerImpl.java >> (PRE-CREATION) >> - src/org/waveprotocol/box/server/waveserver/WaveDigester.java >> (b103bbb) >> - >> src/org/waveprotocol/wave/client/doodad/selection/SelectionAnnotationHandler.java >> (158876a) >> >> View Diff <https://reviews.apache.org/r/16322/diff/> >> > >
