merging conflicting patches with pbranch

[Peter Arrenbrecht]

On Wed, Oct 21, 2009 at 8:45 AM, Peter Arrenbrecht
<peter.arrenbrecht at gmail.com> wrote:
> On Tue, Oct 20, 2009 at 9:29 PM, David Holland
> <dholland+hg at eecs.harvard.edu> wrote:
>> The other issue is that it seems that if you have densely connected
>> branches that you often seem to have to do the same merges over and
>> over again. That is, given
>>
>>                default
>>                 |     \
>>                red     |
>>                 |  \   |
>>                 |   iron
>>               green    |
>>                 |  \   |
>>                 |   copper
>>                blue    |
>>                    \   |
>>                     silver
>>
>> it seems that if I add a change to "red" that causes a conflict in
>> "iron" and merge it by hand, I then end up having to do the exact same
>> merge again in both the "copper" and "silver" branches. This may
>> depend on the order of dependencies in the pgraph file -- I think the
>> problem is that it merges from the sequence that generates the
>> conflict first, so you have to resolve by hand, and only after that
>> does it merge in the resolved version you already did. (But maybe that
>> isn't the issue; plus depending on the symmetry of the patch graph,
>> rearranging the dependency ordering would probably just rearrange
>> which conflicts need to be re-merged.)
>>
>> I can try to prepare a specific simple example if you want.
>
> I actually have the same case right now.
>
>  http://bitbucket.org/parren/hg-pbranch/issue/37/need-to-resolve-same-conflict-repeatedly

See here (scroll down a bit) for a workaround by manually merging a
different patch first:

http://bitbucket.org/parren/hg-pbranch/src/stable/tut/src/pbranch/sanity.rextile

-parren