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

Re: merge conflicts between identical binary files

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2006-05-09 23:24:27 CEST

On 5/8/06, Hayward, Michael A <michael.a.hayward@sun.com> wrote:

> Create a branch (of the trunk)
> Add binary file to trunk
> Rebase (merge) trunk to branch - this adds the binary file to the branch
> Merge branch to trunk - svn will notice the file was added to the branch and
> refuse to merge with the (identical) one on the trunk

It sounds like you have a specific problem, and think that issue 2403
is related, but I'm not entirely sure that it is. Can you be more
specific with your recipe? Saying "merge trunk to branch" or "merge
branch to trunk" is too vague. What we really need is a literal
transcript (commands and resulting output) that demonstrates your
scenario. (Or, a shell script would work as well.)

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue May 9 23:25:14 2006

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