Re: Merging files which a changed property

On 16.06.2005, at 17:24, Jean-Luc Wasmer wrote:

> I have two working copies on my drive: trunk (in folder trunk) and
> branches/branch1 (in folder branch1).
>
> Right now, the only difference between trunk and branch1 is the
> svn:eol-style property for a couple of files.
>
> When I do: svn merge trunk@HEAD branch1@HEAD branch1
> I see:
> U branch1/path/to/file
> for all the modified files.
>
> Unfortunately, a "svn status branch1" returns nothing (no
> modification) and "svn propget svn:eol-style branch1/path/to/file"
> returns the old value.
>
> Am I doing something wrong here?

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.

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. Hence svn status will indeed say that no modifications have
been made, because none have.

What were you wanting to have happen?

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