[Git-dpm-user] merging/rebasing patched branches

[Paul Elliott]

On Mon, Sep 02, 2013 at 09:14:15AM -0500, Paul Elliott wrote:

I am beginning to see that my question has some
generality to it.

Consider 2 maintainers with different sets of
patches that they want to merge or rebase.

from the point of view of their master branch
these will always in conflict in debian/patches.


I guess that using the "whatever" feature is the key to
their co-existing.

One set of changes could be moved to the "whatever" branch
and the other on the master.

To avoid a lot of hacking around in debian/patches,
git-dpm checkout-patches could be run on both master
and whatever.

This would create two patched branches, patched and patched-whatever.
Then patched-whatever could be merged or rebased into patched.

Then git-dpm update-patches could be called on the patched
branch, yielding a master branch with both sets of patches.

The whatever branches could be thrown away if no longer needed.

Is this correct? Does it work? Has anyone ever tried it?

If this is correct this process should be documented.


> 
> I am beginning to understand "whatever" in the man pages.
> 
> If you have a branch that is not named "master" but is
> instead named "whatever" and you do a 
> git-dpm checkout-patches
> 
> you land in "patched-whatever" where you can commit
> your patch and then
> do
> git-dpm update-patches
> which will change your "whatever" branch.
> 
> This feature should be more  thoroughly documented.
> 
> 
> But what happens when the master branch also adds patches
> of its own, that you want to rebase into your whatever branch?
> How do you do that?
> 
> Thank You for considering this question.
> 
> -- 
> Paul Elliott                               1(512)837-1096
> pelliott at BlackPatchPanel.com               PMB 181, 11900 Metric Blvd Suite J
> http://www.free.blackpatchpanel.com/pme/   Austin TX 78758-3117
> ---
> "Encryption works. Properly implemented strong crypto systems are one
> of the few things that you can rely on. Unfortunately, endpoint
> security is so terrifically weak that NSA can frequently find ways
> around it." Edward Snowden



-- 
Paul Elliott                               1(512)837-1096
pelliott at BlackPatchPanel.com               PMB 181, 11900 Metric Blvd Suite J
http://www.free.blackpatchpanel.com/pme/   Austin TX 78758-3117
---
"Encryption works. Properly implemented strong crypto systems are one
of the few things that you can rely on. Unfortunately, endpoint
security is so terrifically weak that NSA can frequently find ways
around it." Edward Snowden
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/git-dpm-user/attachments/20130903/86436116/attachment.sig>