Indeed, I have worked only into the branche opensync-0.4x. So, I should have make two checkout : git clone git://repo.or.cz/barry.git barry git clone git://repo.or.cz/barry.git barry-0.4x
cd barry && git checkout master cd barry-0.4x && git checkout opensync-0.4x Otherwise, I switch always between two branches. Nicolas On Wed, Feb 11, 2009 at 07:48:48PM -0500, Chris Frey wrote: > On Sat, Feb 07, 2009 at 10:32:38AM +0100, Nicolas wrote: > > Hi, > > > > A little patch : > > http://www.progweb.com/modules/blackberry/opensync-plugin/ > > (I have built the patch with the "git format-patch" command) > > Hi Nicolas, > > Thanks very much for these patches, but they do not apply cleanly. > There are a few patches from the master branch as well, which should > not be included here. I'll be rebasing opensync-0.4x on top of master, > and so all those changes will be included. > > As far as I know, the only change to the library that you need is the > storm timeout patch. But otherwise, all patches should apply to the > opensync-plugin-0.4x directory, and the opensync-0.4x branch. > > Just to be clear, this is the development system I'm expecting: > > master branch: > > For library changes, fixes, new features, but nothing > in the opensync-plugin-0.4x directory. > > This branch will always do a git fast-forward when > pulling from the repo. > > To develop on the master branch: > > git checkout -b mine master > <make changes> > git add ; git commit > > # make sure you're in sync with the latest master > git checkout master > git pull > > # create your patch > git checkout mine > git rebase master # do this interactively if you wish > # to clean up the patch series > git format-patch master > > > opensync-0.4x branch: > > This branch is for all opensync 0.4x work, and will be > periodically rebased onto master. I will be doing: > > git checkout opensync-0.4x > git rebase master > git push repo.or.cz opensync-0.4x > > Since the only changes on opensync-0.4x are in the > opensync-plugin-0.4x directory, rebase will always be > successful. > > Developers will be working similar as on the master branch: > > git checkout -b mine opensync-0.4x > <make changes only in opensync-plugin-0.4x/ > > git add ; git commit > > # make sure you're in sync with the latest > git checkout opensync-0.4x > git pull > > # create your patch > git checkout mine > git rebase opensync-0.4x > git format-patch opensync-0.4x > > Then I can do: > > wget http://patch... > git checkout -b test opensync-0.4x > git am 0001-something.patch > <tests and fixes> > > # if all looks ok... > git checkout opensync-0.4x > git merge test ; git branch -d test > git rebase master > git push repo.or.cz opensync-0.4x > > Hope that clarifies things. :-) > > If you have any questions, please let me know. > > - Chris > > > ------------------------------------------------------------------------------ > Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) > software. With Adobe AIR, Ajax developers can use existing skills and code to > build responsive, highly engaging applications that combine the power of local > resources and data with the reach of the web. Download the Adobe AIR SDK and > Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com > _______________________________________________ > Barry-devel mailing list > Barry-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/barry-devel > -- Nicolas ------------------------------------------------------------------------------ Create and Deploy Rich Internet Apps outside the browser with Adobe(R)AIR(TM) software. With Adobe AIR, Ajax developers can use existing skills and code to build responsive, highly engaging applications that combine the power of local resources and data with the reach of the web. Download the Adobe AIR SDK and Ajax docs to start building applications today-http://p.sf.net/sfu/adobe-com _______________________________________________ Barry-devel mailing list Barry-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/barry-devel
