Paul Burba wrote on 2012-11-02:
> Julian Foad wrote:
>> Paul Burba wrote:
>>> Julian Foad wrote:
The following example is adapted from
merge_symmetric_tests.py 18, subtree_to_and_fro(),
"reintegrate considers source subtree mergeinfo":
reintegrate
On Thu, Aug 2, 2012 at 10:45 AM, Julian Foad wrote:
> Hi Paul.
>
> Thanks for looking at this and the other ('deleted subtrees') thread.
> Replies in line below...
>
>
> Paul Burba wrote:
>> Julian Foad wrote:
>>> There are some merge scenarios for which it's not clear whether the
>>> user shou
Hi Paul.
Thanks for looking at this and the other ('deleted subtrees') thread. Replies
in line below...
Paul Burba wrote:
> Julian Foad wrote:
>> There are some merge scenarios for which it's not clear whether the
>> user should specify '--reintegrate' or not. We need to decide what the
>>
On Tue, Jul 17, 2012 at 1:28 PM, Julian Foad wrote:
> There are some merge scenarios for which it's not clear whether the user
> should specify '--reintegrate' or not. We need to decide what the
> 'symmetric' (i.e. automatically-choosing) code should do in those cases.
>
> The following example
I (Julian Foad) wrote:
> Investigating the second of three 'symmetric merge' test failures:
>
> merge_reintegrate_tests.py 10
>
> There is a definite issue concerning reverse merges from the branches' own
> history. In this test, the merge that behaves unexpectedly is the final
> 'reintegrat
Investigating the second of three 'symmetric merge' test failures:
merge_reintegrate_tests.py 10
There is a definite issue concerning reverse merges from the branches' own
history. In this test, the merge that behaves unexpectedly is the final
'reintegrate' shown in the following graph (whic
There are some merge scenarios for which it's not clear whether the user should
specify '--reintegrate' or not. We need to decide what the 'symmetric' (i.e.
automatically-choosing) code should do in those cases.
The following example is adapted from merge_symmetric_tests.py 18,
subtree_to_and_
7 matches
Mail list logo
