Need someone to check my code
Bob Wong
ybx332 at gmail.com
Wed Mar 12 07:50:28 GMT 2025
Hefee <hefee at debian.org> 于2025年3月12日周三 02:02写道:
>
> Hey,
>
> you have two commits on upstream branch - why?
> - the files you delete in 43f0a95c4cd0d2d8ca73e102c0bbfe4c8cf585a6 are they
> shipped in upstream tar ball or not?
> If yes - you are not allowed to delete a file in upstream branch - Please
> remove this commit.
> If not - it is fine - but I would squash the two commits ( but this is purly
> personal decision) - for me it is normal to have one commit that adds/delete
> files from a new version.
> The important part here is: the upstream branch must 100% the same like the
> content of the tarball, otherwiese everything will fail.
Sorry, this is a mistake. Personally speaking, I'd also like to squash
them into a single one. But when I first implement upstream source, I
forgot to delete files that are no longer needed in version 0.10.0. So
I use git rebase and squash the second commit to first one. Now
they're all included in a single commit.
> on master branch you first should import the version that were not reflect in
> git with:
> dget https://deb.debian.org/debian/pool/main/k/kup-backup/kup-backup_0.9.1-2.dsc
> gbp import-dsc PATHTO/DSC
>
> to make sure, that master represents the changes of 0.9.1-2.
Done.
What should I do next? Thanks for pointing it out to me.
Regards,
Bob
More information about the pkg-kde-talk
mailing list