[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

[wc-ng properties and notifications] was: Re: [mergeinfo or wc-ng] 'svn merge -c-N; svn merge -cN' leaving changes behind?

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Sun, 1 Aug 2010 02:19:05 +0300

By the way:

  % rm -rf subversion/mod_dav_svn
  % ../other_wc/subversion/svn/svn up
  A subversion/mod_dav_svn
  A subversion/mod_dav_svn/merge.c
  A subversion/mod_dav_svn/mirror.c
  Conflict for property 'svn:eol-style' discovered on '/home/daniel/src/svn/trunk.d/subversion/mod_dav_svn/authz.c'.
  They want to change the property value to 'native', you want to delete the property.
  Select: (p) postpone,
          (mf) mine-full, (tf) theirs-full,
          (s) show all options:


* the output filenames aren't aligned

* updating a not-on-disk directory causes a prop conflict on a child thereof...
Received on 2010-08-01 01:21:14 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.