[Git-dpm-user] What happens when the upstream accepts one of your patches?

[Bernhard R. Link]

* Paul Elliott <pelliott at blackpatchpanel.com> [120217 05:05]:
> When they make a new release, your patch should become redundant and unneeded.
>
> What happens?

After you have recorded (implicitely with import-new-upstream or explicitely
with new-upstream) you usually rebase your (virtual) patched branch to
your new upstream branch (for example calling git-dpm rebase-patched,
which creates the temporary patched branch and calls "git rebase" with
the appropiate arguments).

If upstream has applied the patch verbatimly, git will often realize
that and just drop it in this rebase.
If upstream has incorporated a different patch, you will get a conflict
during rebase and instead of merging the differences, you can just
"git rebase --skip" it.
If upstream made the changes in a way git does not realize the patch
conflicts with this or is no longer needed, you can just do a
"git rebase -i upstream" (assuming your upstream branch is called
upstream, otherwise replace with the correct name) and skip that patch.
After all of that is done and the patches are in the correct state,
you have to do the usual git-dpm update-patches (or first merge-patched
and then update-patches, if you do not like the debian/patches/
directory updated in the merge commit).

        Bernhard R. Link