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

Re: SVN in consistent merge dry-run and merge commands

From: Joe Eagar <joeedh_at_gmail.com>
Date: 2007-11-07 15:23:46 CET

So does no one have any idea what's going on?

Joe

Joe Eagar wrote:
> Hi. I have svn 1.4.3. I was merging my branch and got an error about
> inconsistent newlines in a file (and btw. . .that's an idiotic thing
> for a fatal error). I undid the merge, fixed the newlines, and did a
> merge dry run, and it worked. However, when actually performing the
> merge I hit the inconsistent newlines error again, despite not showing
> up in the dry run. I checked both the trunk and my local version of
> the file, and they both didn't have inconsistent newlines.
>
> Joe
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 7 15:28:23 2007

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

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