[Aptitude-devel] Modifications to src/ in "debian" branch?

Daniel Hartwig mandyke at gmail.com
Wed Feb 22 09:22:26 UTC 2012


On 22 February 2012 17:12, Manuel A. Fernandez Montecelo
<manuel.montezelo at gmail.com> wrote:
> Ah sorry, I was a bit confused.  With master I was wrongly thinking of
> the version in which master==upstream/0.6.5, and there shouldn't be
> any differences between upstream/0.6.5..debian, and indeed there are
> none.  I hadn't realised that there have been changes to master since
> then.

Just to add to any confusion, the upstream branch is never quite
identical to master:

$ git diff 0.6.5..upstream/0.6.5
…

You will see many files generated by "make dist" which appear in
upstream, but not master!  And some files are removed, such as
.gitignore which is only relevant to master.

That's just how it works ;-)



More information about the Aptitude-devel mailing list