You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Joe Eagar <jo...@gmail.com> on 2007/11/06 11:20:16 UTC
SVN in consistent merge dry-run and merge commands
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
Re: SVN in consistent merge dry-run and merge commands
Posted by Karl Fogel <kf...@red-bean.com>.
Joe Eagar <jo...@gmail.com> writes:
> So does no one have any idea what's going on?
I think people will need an exact reproduction recipe (i.e., one with
data and transcripts).
-Karl
> 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
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: SVN in consistent merge dry-run and merge commands
Posted by Joe Eagar <jo...@gmail.com>.
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