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

Re: svn merge lies?

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-13 22:59:55 CEST

On 7/11/06, Reedick, Andrew <Andrew.Reedick@bellsouth.com> wrote:
> > -----Original Message-----
> > From: rooneg@gmail.com [mailto:rooneg@gmail.com] On Behalf Of
> > Garrett Rooney
> >
> > You might want to try out the 1.4.x branch
> > (release candidate coming real soon now!) and see if it fixes the
> > issue.
> >
> >
> > -garrett
>
>
> Ugh, I was right for at least 1.3.0. I'll have to check on 1.4 later.
>
> It is an evil_twin/add+delete problem:
> Create trunk.
> Branch from trunk
> 'svn add' foo.java to trunk
> 'svn add' foo.java to branch
> Merge branch to trunk
> a) 'svn merge' outputs an 'A' to represent the object
> merge
> b) does a merge conflict (since the file contents of the
> objects are different)
>
>
> > If you can find a simple reproduction recipie that would be great...

Thanks for the script!

It looks like this is still a problem both in trunk and 1.4.x. The
change is pretty simple, I just need to make sure nothing depends on
the current behavior.

Thanks again,

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jul 13 23:01:53 2006

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