Re: Merging files which a changed property

Ryan Schmidt wrote:

> I'm not sure I understand what task you're trying to accomplish. Let
> me see if I understand the scenario.
>
> In your repository, you have trunk and branch1. The only difference
> is that svn:eol-style is different on some files.
>
> You have working copies of both trunk and branch1, I'm presuming
> without any local modifications.

Yes... that is correct.

> In your svn merge command, then, you've asked to get the list of
> changes that occurred between trunk and branch1, and then apply them
> to your working copy of branch1 -- which doesn't make any sense,
> because the changes have already been done in your working copy of
> branch1.

Why have the changes "already been done in [my] working copy of branch1"?

The svn:eol-style property was set to native, then branch1 was created,
then the property was changed to LF in trunk.... now I want to merge
that modification in branch1. How am I supposed to do the merge?

JL

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jun 17 19:30:15 2005