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

Re: Issue 2784 Work In Progress Patch

From: David Glasser <glasser_at_mit.edu>
Date: 2007-05-28 17:19:00 CEST

On 5/25/07, Jeremy Whitlock <jcscoobyrs@gmail.com> wrote:
> + # Create expected disk tree for the update.
> + expected_disk = svntest.main.greek_state.copy()
> + expected_disk.tweak('A/mu', contents="""This is the file 'mu'.
> +<<<<<<< .mine
> +Conflicting appended text for mu
> +=======
> +Original appended text for mu
> +>>>>>>> .r2
> +""")

Hmm, you might want to avoid putting literal conflict markers into the
test; it could get confusing!

Perhaps just use a series of "double-quoted"+"added together" strings
with proper indentation instead of triple-quoted strings?

--dave

-- 
David Glasser | glasser_at_mit.edu | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon May 28 17:21:19 2007

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