At last the merge worked!<br><br>For the record:<br>1) I had to save over a few offending files (rna_object_force.c, ed_pointcache.c) with different line endings a few times and commit them<br>2) Merge as usual<br>3) For every conflicted file, I just dismissed the conflicts and copied over the 2.5 versions<br>
<br><div class="gmail_quote">On Thu, Jun 25, 2009 at 2:31 AM, Chris Want <span dir="ltr"><<a href="mailto:cwant@ualberta.ca">cwant@ualberta.ca</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
Joshua Leung wrote:<br>
> File Attached...<br>
<br>
Hi Joshua,<br>
<br>
I'm finding that there are random ^M's all throughout this<br>
file. The particular lines that are problematic are the<br>
ones that were modified in blender2.5 by GSR (revision<br>
21093) where he fixed some EOL's and then in 21094 he<br>
changed properties on the file to prevent further mixed<br>
line endings. I'm guessing this was done sometime after<br>
the last time you merged, and that the changed SVN<br>
properties are what is stopping you from being able to<br>
merge. I'll talk to him about this today. I suspect we<br>
need to train people to set SVN properties right when<br>
they add new files to the repository. In the meantime,<br>
do you have cygwin? If so, you might want to run 'dos2unix'<br>
on the file and see if that helps.<br>
<br>
By the way, it appears that the original problem of<br>
mixed line endings was caused by revision 21050 by<br>
Janne Karhu (cc-ed on this message). Janne, can you<br>
check your editor for a setting that might avoid such<br>
problems in the future?<br>
<br>
<br>
Chris<br>
<div class="im"><br>
><br>
><br>
> On Thu, Jun 25, 2009 at 12:16 AM, Chris Want <<a href="mailto:cwant@ualberta.ca">cwant@ualberta.ca</a><br>
</div><div class="im">> <mailto:<a href="mailto:cwant@ualberta.ca">cwant@ualberta.ca</a>>> wrote:<br>
><br>
> Joshua Leung wrote:<br>
> > Argh!<br>
> ><br>
> > It seems that I once again have heaps of weird conflicts again<br>
> (probably<br>
> > as a result of having some commits occurring in 2.5 before my<br>
> previous<br>
> > merge was completed). Anyways, I'm currently unable to continue<br>
> merging<br>
> > as TortoiseSVN bails out on rna_object_force.c with complaints of<br>
> > "inconsistent line endings".<br>
> ><br>
> > Help on this would be great.<br>
> > My last merge commit was<br>
> ><br>
> <a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074</a><br>
> <<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074</a>><br>
> ><br>
> <<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074</a><br>
> <<a href="http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074" target="_blank">http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074</a>>><br>
> ><br>
> > Cheers,<br>
> > Joshua<br>
><br>
> Can you send the file from your working copy to the list?<br>
><br>
> Chris<br>
><br>
> _______________________________________________<br>
> Soc-2009-dev mailing list<br>
</div>> <a href="mailto:Soc-2009-dev@blender.org">Soc-2009-dev@blender.org</a> <mailto:<a href="mailto:Soc-2009-dev@blender.org">Soc-2009-dev@blender.org</a>><br>
<div class="im">> <a href="http://lists.blender.org/mailman/listinfo/soc-2009-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2009-dev</a><br>
><br>
><br>
><br>
</div>> ------------------------------------------------------------------------<br>
<div><div></div><div class="h5">><br>
> _______________________________________________<br>
> Soc-2009-dev mailing list<br>
> <a href="mailto:Soc-2009-dev@blender.org">Soc-2009-dev@blender.org</a><br>
> <a href="http://lists.blender.org/mailman/listinfo/soc-2009-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2009-dev</a><br>
<br>
_______________________________________________<br>
Soc-2009-dev mailing list<br>
<a href="mailto:Soc-2009-dev@blender.org">Soc-2009-dev@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/soc-2009-dev" target="_blank">http://lists.blender.org/mailman/listinfo/soc-2009-dev</a><br>
</div></div></blockquote></div><br>