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

Re: FW: merge conflicts between identical binary files

From: Ben Collins-Sussman <sussman_at_red-bean.com>
Date: 2006-05-10 20:41:19 CEST

On 5/10/06, Daniel Rall <dlr@collab.net> wrote:

> > So yes, you're hitting issue 2403. But on the other hand, you
> > shouldn't be trying to merge redundant changesets like this. Fix your
> > process. :-)
>
> Fixing your process is definitely a valid work around, but eventually
> the Subversion can automatically support this use case.

Yes, once we have merge tracking, users won't have to keep track of
things to prevent repeated merges.

Mmmm, merge tracking ... SMOP.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed May 10 20:42:20 2006

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