Re: making conflicts

Greg Hudson wrote:
>
> Pick some value of N suitably removed from the current revision and try,
> in a throwaway checkout:
>
> svn diff -r BASE:N . | sed -e 's/^\(+.*)$/\1 /' | patch -p0
> svn up -r N
>
> The idea is to modify your sources to have all of the changes you'd get
> from updating to revision N, but with a space at the end of the lines,
> so that every change conflicts.
>
That is nice. THanks Greg!

Edmund

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1557160
Received on 2009-04-06 04:19:15 CEST