Re: Bug? svn update --accept mine-full fails if an added file exists unversioned in the working copy

2011-02-20 Thread Danny Trebbien
On Sun, Feb 20, 2011 at 10:17 AM, Stefan Sperling wrote: > The file isn't versioned yet. So it cannot be considered part of the > 'mine' changeset. You should add the file so that Subversion knows > it is supposed to consider it. > > However, if you add the file you will get a tree conflict when y

Re: Bug? svn update --accept mine-full fails if an added file exists unversioned in the working copy

2011-02-20 Thread Danny Trebbien
On Sun, Feb 20, 2011 at 10:11 AM, Daniel Shahaf wrote: > For update, the '--force' switch means "If a local file obstructs an > incoming add, then use that file (and flag the file as > locally-'M'odified) instead of flagging a tree conflict".  Have you > tried it? > > P.S.  In Subversion 1.7, you

Bug? svn update --accept mine-full fails if an added file exists unversioned in the working copy

2011-02-20 Thread Danny Trebbien
I have a check out of Subversion trunk and the official Apache git mirror of Subversion coexisting in the same directory (my working copy is both a Subversion and git working copy). Because I want to use git to hack on trunk, I normally update the working copy using git, and then update the Subver

Re: svnsync failure when syncing with a repository that used ISO-8859-1 for log messages

2010-12-21 Thread Danny Trebbien
> > Hi Danny, > > I am working with Geir Engebakken on this and we understand you won't > > release > > the patch now until 1.7.x - That's fine but I wanted to try out the patch > > myself > > now so I tried to run it in and it is looking for sync.c and sync.h which > > dont > > seem to exist in

Re: svnsync failure when syncing with a repository that used ISO-8859-1 for log messages

2010-12-04 Thread Danny Trebbien
Geir, I looked through some scripts that I wrote to help me sync the GNU Nano repository and I came across a Perl script that might be useful to you in quickly identifying all log messages that are not representable in ASCII (hence possibly not UTF-8). Attached is the source of the script. To use

Re: svnsync failure when syncing with a repository that used ISO-8859-1 for log messages

2010-11-30 Thread Danny Trebbien
> I must be missing something here, is this patch applied to the current SVN > source? > > I have downloaded SVN 1.6.15 source from Tigris.org, and cant find the > changes in the source. Also this patch is applied to a file : > subversion/svnsync/sync.c but in my downloaded source there is only