On Nov 5, 2008, at 12:15, vinay i wrote:
>> Actually, that's not the diff between r37721 and the release
>> version. It's the diff between r37720 and r37721 of the trunk
>> (which may or may not be the same as what you said).
>
> Correct. I want to merge the diff between r37720 and r37721 of
> the trunk to release branch and not "diff between r37721 and the
> release version". Isn't it possible to do?
Sure it's possible, using the command you gave. I was just correcting
your description of what you were doing with what you were actually
doing.
>> Are there changes in line ending? e.g. trunk uses DOS-style line
>> endings and branch uses UNIX-style? If so, you need to decide on a
>> line ending style and apply it to all files.
>
> a. How to determine the line ending style for a particular file?
Open the file in a text editor that tells you that kind of thing.
> b. Both my trunk and release branches were converted from a
> cvs repository using cvs2svn. So won't both my trunk and release
> branches as the same line ending style?
Perhaps you used different text editors to edit the file in trunk
than you did in the branch, and one of them didn't know how to deal
with foreign line endings and silently converted the line endings of
the file to DOS format? There are editors that do that; I remember
UltraEdit on Windows being problematic until you found all four
obscure settings you had to change to make it play nicely with files
of varying line ending styles.
>> Or maybe the changes just can't be merged. It looks like a
>> conflict occurred. So you may just need to resolve it manually.
>
> I kept adding one line for every change from "# chaneg1" to "#
> change5" for every revision on trunk. Ideally conflict should not
> occur in this case.
I agree.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-06 03:05:53 CET