HI!
Can anyone tell me, if this is a bug or a feature?
Thanks!
Thomas
"Thomas Börkel" <tbo@ap-ag.com> wrote in message
news:dmjp1i$u7q$1@sea.gmane.org...
> HI!
>
> I guess, this is a bug in Tortoise, but I am not sure. Here is a repro
> recipe:
>
> Create a file "SpaceTest.txt" in branch 1 with this content:
> This is a Test!
> a
> b
> c
> d
>
> Copy that file in repository to branch 2.
>
> Change the content (and commit) of the file in branch 1 to:
> This is a Test!
> a
> b
> c
> d
>
> Change the content (and commit) of the file in branch 1 to:
> This is a Test!
> a
> b
> c
> d
> blah
>
> Change the content (and commit) of the file in branch 1 to:
> This is a Test!
> a
> b
> c
> d
> foo
>
> Now merge the "blah" commit to branch 2. This results in a conflict. So,
> open in TortoiseMerge. TortoiseMerge must be set to ignore all
whitespaces.
> Resolve the conflict with "theirs before mine" and click on Save and then
on
> Resolve and close TortoiseMerge (it asks again, if I want to save here, is
> this a bug?).
>
> Now my branch 2 file looks like this:
> This is a Test!
> a
> b
> c
> d
> blah
> foo
>
> It copied thie first line from the branch 1 file, despite the fact, that
it
> was not part of the merged commit.
>
> I know, that Subversion uses the file where the diff comes from as base
for
> the new working copy file, but still this is awkward. And it behaves the
> same, if I configure TortoiseMerge to ignore LEADING whitespaces. At least
> then, it should not change the first line, because that are not leading
> whitespaces. It only behaves as expected, if I configure it to compare
> whitespaces.
>
> Thanks!
>
> Thomas
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Tue Dec 6 07:53:45 2005