Yes, thank you.
I noticed it after i found those markers few lines later. Then i
remembered that it's svn were're using ;o)
Michael
On 24 Apr., 21:41, Jay Klehr <[EMAIL PROTECTED]> wrote:
> That's the way that SVN stores information when there is a conflict.
>
> Most likely you had edited the file, then did an svn update, and the
> changes it pulled in were around the same line numbers that you had
> edited, which flags the file as a conflict.
>
> If you want your file to match the one that you're pulling in from the
> svn update, then you'll need to revert the file.
>
> Probably best to read about Resolving Subversion Conflicts.
>
> [EMAIL PROTECTED] wrote:
> > Forget my last message.
> > Strange, after svn update i had some strange charachters
> > ("<<<<<<<<<<< .mine") at that line?!
>
> > Michael
>
> > On 24 Apr., 21:16, Carl Vondrick <[EMAIL PROTECTED]>
> > wrote:
>
> >> On Thursday, April 24, 2008, Romain Dorgueil wrote:
>
> >>> Sorry to have reverted your patch, but additionally to the fact it is
> >>> not working for php < 5.2.4 (which is not yet stable), it also requires
> >>> php 5.2 to "look like it should work if php works correctly) and symfony
> >>> 1.1 claims to work for php minimum version 5.1.4
>
> >> Romain,
> >> No problem about reverting the patch. I didn't realize that
> >> ->getRealPath()
> >> was buggy < 5.2.4.
>
> >> Anyways, I have created a new patch in #3407, which consolidates tickets
> >> #2880
> >> and #3389. This one doesn't use ->getRealPath(), but still uses
> >> DirectoryIterator.
>
> >> If it looks good, either let me know and I'll commit or you can commit it
> >> yourself.
>
> >> Carl
>
> >>> Your new patch seems ok, but DirectoryIterator can be used too, but
> >>> _not_ using ->getRealPath() method, wouldn't ->getPath() method be
> >>> sufficient? This one is present since 5.1 i think.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"symfony developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/symfony-devs?hl=en
-~----------~----~----~----~------~----~------~--~---
