← Back to branch summary

~ubuntu-branches/ubuntu/precise/subversion/precise-security

« back to all changes in this revision

Viewing changes to subversion/libsvn_wc/merge.c

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-06-06 22:57:04 UTC
  • mfrom: (1.2.1 upstream)
  • mto: (1.3.4 merge)
  • mto: This revision was merged to the branch mainline in revision 32.
  • Revision ID: james.westby@ubuntu.com-20090606225704-aivy7dhglo1zd120
Tags: upstream-1.5.6dfsg
Import upstream version 1.5.6dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
subversion/libsvn_wc/merge.c
205
205
               svn_wc_adm_access_path(adm_access),
206
206
               svn_io_file_del_none, pool));
207
207
 
 
208
      /* Always 'repair' EOLs here, so that we can apply a diff that
 
209
         changes from inconsistent newlines and no 'svn:eol-style' to
 
210
         consistent newlines and 'svn:eol-style' set.  */
208
211
      SVN_ERR(svn_subst_translate_to_normal_form(merge_target,
209
212
                                                 detranslated,
210
213
                                                 style,
211
 
                                                 eol, eol ? FALSE : TRUE,
 
214
                                                 eol,
 
215
                                                 TRUE /* always_repair_eols */,
212
216
                                                 keywords,
213
217
                                                 special,
214
218
                                                 pool));
243
247
                                      svn_wc_adm_access_path(adm_access),
244
248
                                      svn_io_file_del_none,
245
249
                                      pool));
 
250
 
 
251
      /* Always 'repair' EOLs here, so that we can apply a diff that
 
252
         changes from inconsistent newlines and no 'svn:eol-style' to
 
253
         consistent newlines and 'svn:eol-style' set.  */
246
254
      SVN_ERR(svn_subst_copy_and_translate3(old_target,
247
255
                                            tmp_new,
248
 
                                            eol, eol ? FALSE : TRUE,
 
256
                                            eol, TRUE /* repair EOLs */,
249
257
                                            NULL, FALSE,
250
258
                                            FALSE, pool));
251
259
      *new_target = tmp_new;