[git-buildpackage] Import-orig patch to avoid dropping commits

Maximiliano Curia maxy at gnuservers.com.ar
Sun Jul 21 03:29:34 CEST 2019


Hi,

We are here at DebConf and we found out when you are committing in a feature 
branch and then you try to import a new upstream release, the commits that you 
added in the feature branch that are not committed to the debian-branch are 
lost. This ended up in the attaching patch.

Anyway, it seems counter intuitive that the changes are applied in a different 
branch. Are you sure that the default behaviour should be to work in the 
debian-branch instead of the current one?

Happy hacking,
-- 
"Programs must be written for people to read, and only incidentally for 
machines to execute."
-- Hal Abelson, "Structure and Interpretation of Computer Programs"
Saludos /\/\ /\ >< `/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-import-orig-merge_replace-Avoid-calling-force_head.patch
Type: text/x-diff
Size: 1249 bytes
Desc: not available
URL: <http://lists.sigxcpu.org/pipermail/git-buildpackage/attachments/20190721/36435e62/attachment.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.sigxcpu.org/pipermail/git-buildpackage/attachments/20190721/36435e62/attachment.sig>


More information about the git-buildpackage mailing list