Hello On 22 February 2012 00:25, Manuel A. Fernandez Montecelo <[email protected]> wrote: > Maybe you already noticed this before, but there are modifications > from the "debian" branch other than Makefile.in, changes to the source > code itself, e.g.: > ---------------------------------------------------------------------------------------- > $ PAGER="" git diff master..debian src/cmdline/text_progress.cc
What you are seeing is the *difference* between the versions in master and debian. The changes have actually been made on the master branch, not the debian branch. $ git log -n1 debian -- src/cmdline/text_progress.cc commit b9a2880ae07bccd9a81d82e706bded8b86fbabc2 Author: Daniel Burrows <[email protected]> Date: Sun May 15 20:13:40 2011 -0700 Imported Upstream version 0.6.4 $ git log -n1 master -- src/cmdline/text_progress.cc commit 81c836c859fc4e5dfece7f2015cc5bb94fcfd128 Author: Daniel Hartwig <[email protected]> Date: Sun Feb 12 00:36:37 2012 +0800 Silence text progress when -q2 So this is the work flow we are after. > > Probably this is due to some oversight, but I guess that it should be > corrected and that "debian" should only contain the added "debian/" > dir, or at most some building-system related stuff. You are correct about what changes should be made to the debian branch between release. This did not happen very smoothly during the last release, but since then everything is ok: $ git log debian/0.6.5-1..debian commit 6052dad10c39848268404074f34a8417c1e2fe67 Author: Manuel A. Fernandez Montecelo <[email protected]> Date: Tue Feb 21 16:58:55 2012 +0000 Revamp with current information commit 49ad3d6c1546bfd9d3d29c000ee3df7e41230c1a Author: Manuel A. Fernandez Montecelo <[email protected]> Date: Tue Feb 21 16:41:35 2012 +0000 Copy the first paragraph of the Description from the main package over to the -doc ones, a lo > > What do you think? Any volunteer to untangle this, if everybody > agrees that it's a good idea? Looks like everything is running ok for this release. I will soon push a document detailing the development process and how the various branches relate and should be used. For now there is this snippit: The debian, upstream, and pristine-tar branches directly store the Debian history of aptitude. They are not related to the master branch and should be updated to new versions only by using git-importorig on an archive generated by make dist. from the homepage[1]. Regards [1] http://algebraicthunk.net/~dburrows/projects/aptitude/contributing/ _______________________________________________ Aptitude-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/aptitude-devel
