[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Tree conflict problem when merging two branches

From: André Roy <andre_at_dsa-ltd.ca>
Date: Mon, 15 Aug 2016 09:14:53 -0700

Thanks Brane,

Has a bug report been filed or should I try to file one?

André

On Sat, Aug 13, 2016 at 5:07 AM, Branko Čibej <brane_at_apache.org> wrote:

> On 13.08.2016 00:20, Ryan Schmidt wrote:
> >> On Aug 12, 2016, at 3:00 PM, André Roy <andre_at_dsa-ltd.ca> wrote:
> >>
> >> Hi all,
> >>
> >> First time posting.
> >>
> >> -Create a repository (trunk/tags/branches),
> >> -Checkout /trunk,
> >> -Create branch1 in /branches/branch1, and checkout.
> >> -Create and checkout branch2.
> >> -Create file.txt in Trunk + add + commit.
> >> -Merge trunk changes into branch1 and commit.
> >> -Merge trunk changes into branch2 and commit.
> >>
> >> The problem:
> >> -Merge branch1 changes into branch2, gives me a Tree conflict with
> file.txt.
> >>
> >> Am I doing something wrong?
> > Probably :)
> >
> > Show us the exact transcript of commands you used for the above?
> >
> > Review the merging chapter in the book?
> >
> > http://svnbook.red-bean.com/en/1.7/svn.branchmerge.html
>
>
> It appears to be a bug in our merge algorithm, it doesn't notice from
> mergeinfo that the file was already merged from the same source. See the
> attached reproduction script and transcripts for 1.9.x and trunk: the
> only difference is that the trunk merge resolver gives more options for
> resolving the conflict (thank you, stsp!)
>
>
> -- Brane
>
>

-- 
___________________________________
André Roy, P.Eng.
Dynamic Systems Analysis Ltd.
101-19 Dallas Road
Victoria, BC, Canada; V8V 5A6
p: +1.250.483.7207 ext. 106
e: andre_at_dsa-ltd.ca
w: www.dsa-ltd.ca
___________________________________
Received on 2016-08-15 18:15:25 CEST

This is an archived mail posted to the Subversion Users mailing list.