Jeroen Ruigrok van der Werven wrote: > -On [20071211 14:44], Christian Boos ([EMAIL PROTECTED]) wrote: > >> And what about last week's http://trac.edgewall.org/changeset/6290 ? >> > > Mmm, peculiar, since my conflicts started around that and I am now resolving > the 6292 conflicts. >
Well, it's most probably because svnmerge didn't cope well with that prop change. Try to svnmerge up to r6290, then check if the svn:eol-style is effectively set to "native" (if not, do it manually). Then commit. Then svnmerge up the rest, it should /not/ conflict that time. -- Christian > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Development" 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/trac-dev?hl=en -~----------~----~----~----~------~----~------~--~---
