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

issue with merges in 1.5 with props, script attached.

From: Alfred Perlstein <alfred_at_freebsd.org>
Date: Tue, 24 Jun 2008 09:58:55 -0700

Hey guys,

When using merging with properties I get conflicts
even when the merge should succeed without issue.

It's easy enough to reproduce with the script attached.

Note: please change:
in the script to point at your repo.

What I would like is:
1) non-meta-data should just merge without issue
2) option to specify to always "take" a property from
   either the TO or FROM branch as a seperate option.


- Alfred Perlstein

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org

Received on 2008-06-24 18:59:11 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.