On 5/28/07, Karl Fogel <kfogel@red-bean.com> wrote:
> Karl Fogel <kfogel@red-bean.com> writes:
> > "David Glasser" <glasser@mit.edu> writes:
> >> 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?
> >
> > Really? I have to admit, I find the one-big-string approach easier
> > for blocks of text like that...
> >
> > http://pink.bikeshed.com/
>
> Change of mind -- David clarified to me in IRC what he meant:
>
> <glasser> kfogel: it's not triple-quoting in general that's confusing
> <glasser> it's tripple-quoting conflict markers in the first column!
>
> <kfogel> glasser: Oh, I see.
> <kfogel> yes, I agree with you then, didn't think of that
> <kfogel> I have an idea.
> <kfogel> Let's you and me both go edit those files right now,
> simultaneously, and come up with slightly different
> solutions for how to rearrange the text, and then both
> commit around the same time, and see what happens.
>
> <glasser> +1
I changed all instances of conflict markers in column 0 in the tests
to a more indented style in r25174.
--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 21:23:39 2007