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

RE: Preventing Merge on Conflict

From: Reedick, Andrew <Andrew.Reedick_at_BellSouth.com>
Date: 2006-09-29 00:09:37 CEST

> -----Original Message-----
> From: chtaylo3@vt.edu [mailto:chtaylo3@vt.edu]
> Sent: Thursday, September 28, 2006 6:00 PM
> To: users@subversion.tigris.org
> Subject: Preventing Merge on Conflict
>
>
>
> Hello all,
>
> I was wondering if there is a way to prevent svn from
> attempting to do an
> automatic merge when you have an "changed-out of date" conflict? The
> developers whould rather manually merge the documents everytime.
>

Not that I know of.

A workaround is to have a script run through the merge conflicts and
copy either the 'foo.java.working' or 'foo.java.merge-right.r123' to
foo.java.

svn status | sed 's/^C......//' |
while read i
do
        cp -p $i.working $i
done

*****

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA622

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Sep 29 00:10:33 2006

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