Re: Switching to git
Hi Felipe, |--==> On Tue, 14 Oct 2008 17:15:33 -0300, Felipe Sateler <[EMAIL PROTECTED]> said: FS> El 14/10/08 16:34 Free Ekanayaka escribió: >>Hi team, >> >>since today we have git repository for our packages FS> What is the structure of the git repository? The standard structure is the one suggested by git-buildpackage: the "upstream" branch is for the original upstream code, while the "master" branch is for the actual debian source package (ideally it should only add the debian/ directory), The other branches are my one working branches. FS> There seem to be some branches FS> for each patch, but then the patch is stored in master as a quilt patch. FS> What FS> is the intended workflow? I'm using those branches to keep track of the changes I make to the various patches. For example if you want to make a new patch, you can create a new branch starting from the latest upstream code: git branch my_new_patch upstream And then edit & commit till you are satisfied. Now if you are on the my_new_patch branch and you run the command git diff -r upstream you can use its output to generate the relevant quilt patch. The good thing of this procedure is that you can split your patch in several commits, so when you import a new upstream release and merge it's easier to merge the changes and resolve possible conflicts. That's my own workflow, but git is actually very flexible and it can be used in many ways. Ciao! Free -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Re: Switching to git
El 14/10/08 16:34 Free Ekanayaka escribió: > Hi team, > > since today we have git repository for our packages What is the structure of the git repository? There seem to be some branches for each patch, but then the patch is stored in master as a quilt patch. What is the intended workflow? Saludos, Felipe Sateler signature.asc Description: This is a digitally signed message part.
Switching to git
Hi team, since today we have git repository for our packages, it is hosted at: http://git.debian.org and I've already migrated the ardour source package from the former SVN repository to the new git one, you can find it here: http://git.debian.org/?p=demudi/ardour.git;a=summary All members of the Debian Multimedia alioth project have write access to the repository. Git is a big step forward with respect to SVN; it makes collaborative maintenance even more effective and the maintenance process in general much cleaner (especially when it comes to manage patches). For those of you new to git I'd suggest these documents: http://www.kernel.org/pub/software/scm/git/docs/gittutorial.html http://honk.sigxcpu.org/projects/git-buildpackage/manual-html/gbp.html Once you get to know it, you won't never look back :) Ciao, Free -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
ardour_2.5-1_amd64.changes ACCEPTED
Accepted: ardour_2.5-1.diff.gz to pool/main/a/ardour/ardour_2.5-1.diff.gz ardour_2.5-1.dsc to pool/main/a/ardour/ardour_2.5-1.dsc ardour_2.5-1_amd64.deb to pool/main/a/ardour/ardour_2.5-1_amd64.deb ardour_2.5.orig.tar.gz to pool/main/a/ardour/ardour_2.5.orig.tar.gz Override entries for your package: ardour_2.5-1.dsc - source sound ardour_2.5-1_amd64.deb - optional sound Announcing to [EMAIL PROTECTED] Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
Processing of ardour_2.5-1_amd64.changes
ardour_2.5-1_amd64.changes uploaded successfully to localhost along with the files: ardour_2.5-1.dsc ardour_2.5.orig.tar.gz ardour_2.5-1.diff.gz ardour_2.5-1_amd64.deb Greetings, Your Debian queue daemon -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
