Re: Symmetric merge and subtrees

2012-11-02 Thread Paul Burba
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

Re: Symmetric merge and subtrees

2012-08-02 Thread Julian Foad
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 >>

Re: Symmetric merge and subtrees

2012-07-31 Thread Paul Burba
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

Re: Symmetric merge and subtrees

2012-07-24 Thread Julian Foad
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

Re: Symmetric merge and subtrees

2012-07-18 Thread Julian Foad
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