On Tue, Mar 25, 2014 at 8:24 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> On 25.03.2014 18:42, Lieven Govaerts wrote:
>> Hi,
>>
>>
>> we have encountered an issue with merge info and merges, when using
>> mixed FQDN/short names.
>> Client = TSVN 1.8.4 - 64bit on Windows 7.
>> Server = apache+mod_dav_svn 1.8.1
>> Hostname of the server = 'scm.example.com'. Within our corporate
>> network example.com, we can use the short name 'scm'.
>>
>> Scenario
>> --------
>> Setup:
>> - Create branch TC
>> - Make some changes
>> - Create a new branch JB, based on branch TC.
>> - Continue working on both branches.
>>
>> With TortoiseSVN:
>> - Checkout a working copy of branch https://scm/repo/branches/JB
>> (using the short name of the server)
>> - Merge the changes on branch TC to working copy JB:
>> - Right click on working copy JB, select Merge
>> - Choose Merge a range of revisions
>> - Url to merge from: https://scm/repo/branches/TC (also using the
>> shortname of the server)
>> - Select all revisions
>> - [Show log] now shows the revisions already merged correctly
>> flagged as merged => Works as expected.
>> - [Next] -> [Merge] now merges the eligible revisions correctly =>
>> Works as expected.
>>
>> The problem happens when doing this merge with the server's FQDN
>> instead of short name:
>> - Right click on working copy JB, select Merge
>> - Choose Merge a range of revisions
>> - Url to merge from: https://scm.example.com/repo/branches/TC (FQDN
>> of the server)
>> - Select all revisions
>> - [Show log] now shows all revisions from the TC branch, and marks
>> them as 'not yet merged', even those that were merged => Wrong!
>> - [Next] -> [Merge] now merges all revisions froms the TC branch,
>> even those merged previously => Wrong!
>>
>> Now the problem is not so much that TSVN does not recognize scm and
>> scm.example.com as being the same host. This would be nice but is not
>> why I report this issue.
>> The problem is that TSVN actually tries to do that merge, without any warning.
>>
>> The svn command line tools don't try to do that merge at all, which I
>> think is the right behavior:
>> C:\JB>svn merge https://scm.example.com/TC
>> svn: E195012: 'https://scm.example.com/TC' must be from the same
>> repository as 'C:/JB'
>>
>> Any idea why TSVN tries to do this merge?
>
> Do you have by any chance checked the box "ignore ancestry" on the last
> page of the merge wizard dialog?
>
Good question. We're using the standard TSVN settings.
I've checked again, and I see the following::
On the "show log" dialog there is no such option.
In the 2nd stop of the merge wizard, "Ignore ancestry" is not checked.
Lieven
> Stefan
>
> --
> ___
> oo // \\ "De Chelonian Mobile"
> (_,\/ \_/ \ TortoiseSVN
> \ \_/_\_/> The coolest interface to (Sub)version control
> /_/ \_\ http://tortoisesvn.net
>
> ------------------------------------------------------
> http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3075216
>
> To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3075261
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-26 13:47:04 CET