[Pkg-clamav-devel] OK, is it just me?

Stephen Gran sgran at debian.org
Thu Sep 4 10:55:31 UTC 2008


This one time, at band camp, Michael Tautschnig said:
> [...]
> > 
> > What I've done is added the 0.94 branch to our git tree, cloned it into
> > a new branch 'test' and cherry-picked all of my commits I can find.
> > What remains to be done is to go over test and debian/unstable carefully
> > and make sure I didn't miss any commits.  If so, cherry-pick them in.
> > 
> [...]
> 
> Ok, just as an intermediate note: A review of the histories showed the following
> patch-sets are missing, but to me it seems this might be intentional:
> 
>   * 3f7d6c6ccfe5fcb8364717f1515dea95805bbae5 (Add manpage patch - this should
>     really go upstream)

This one was a real patch, but it looks like it may be upstream now.
Trying to cherry-pick it results in a no op, so there is nothing to
merge.

>   * 8211b3a785004700616519ae0c50a9d20aea3276 (Merge commit
>     'c75488a45de4dc42160a16643ffcaa2c88cc2c58' into debian/unstable)
>   * fe88f5809266d222700de9ab87745dc6624303bc (update database)
>   * cbd63dfe8584a5dabfdf680e399e14e4aacc5640 (the tarball does not contain these
>     files.)
>   * 1a4f9ddecbe133880f41d668c685b05779259753 (Merge branch 'upstream/0.93' into
>     debian/unstable)
>   * fc8689eb6caf4d8301be803e40ce92f144ac8c3f (Apparently the tarball does not
>     match the tag.)

These look like the usual 'beating it with a hammer' to make what's in
the VCS match what's in the tarball.

> If you could just confirm that these were intentionally left out, we could
> probably continue with the further steps you proposed.

Thanks for the review - it looks like I managed to get some of it right
yesterday :)
-- 
 -----------------------------------------------------------------
|   ,''`.                                            Stephen Gran |
|  : :' :                                        sgran at debian.org |
|  `. `'                        Debian user, admin, and developer |
|    `-                                     http://www.debian.org |
 -----------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-clamav-devel/attachments/20080904/21c6c115/attachment.pgp 


More information about the Pkg-clamav-devel mailing list