Bug#543541: RFH: quilt -- Tool to work with series of patches
On Wed, 26 Aug 2009, Martin Quinson wrote:
> Well, I'm trying, but I'm in the middle of the git hell. I did my update
> work on a raw directory, not in a git dir. And now that raphaël forked
> the 0.46 branch under my feet, I'm falling...
Right, we should somewhat agree on our git usage. I suggest to use
some of the git-buildpackage helper tools to manage our repository.
I just used git-importorig to update the upstream branch with version 0.47
followed by version 0.48. I configured it to use pristine-tar too so that
we can recreate the orig tarball from the git repo.
I suggest to not use the auto-generation of the changelog for now and keep
managing it manually.
The process is then:
- branch away from master if wanted (I used experimental)
- merge upstream release 0.48
- add new changelog entry
- fixup what needs to be fixed
I just did that and pushed the resulting experimental branch. It contains
your changes only for now but we're ready for further work in that branch.
I removed your 0.48 branch for clarity.
Note that we never want to commit changes to upstream files in our
repository. Changes to upstream files should be managed with quilt (heh).
If you have questions, feel free to ask.
Cheers,
--
Raphaël Hertzog
Reply to: