2009/5/13 Andreas Schnederle-Wagner - Futureweb.at <schnederle_at_futureweb.at>:
> Hello,
>
> it seems there are some problems with tortoise SVN and merging - reproduced it several times with test files.
>
> Our repo layout:
>
> ---- repo 1
> |
> - repo 2 (=branch of repo 1 - for our external developers)
>
>
> 1) on repo 1 I create a file: text.txt and fill the first line with "repo 1 test line"
> 2) I commit it - and merge it into repo 2 (everything fine so far)
> 3) in repo 2 I add on line 3 "line added in repo 2"
> 4) I commit it and merge it back into repo 1 (everything fine so far)
> 5) in repo 1 I add some text nn line 2 -> "repo 1 text line 2" / in repo 2 I add some text on line 4 -> "repo 2 text line 4" (so every change is on a separate line)
> 6) I commit repo 1 and repo 2 - merge repo 1 into repo 2 --> what happens? --> conflicts - and from now on every change (either in repo 1 or 2) leads to further conflicts ...
>
> If I haven't missed something this seems like a decent bug?
>
>
> And a little Question regarding merging and properties - in the scenario I described - every time I merge + commit the test.txt file is marked as changed (even if sometimes no text is changed within this file) - it always shows that the svn:mergeinfo property has changed - I guess this behavior is right? (just a bit disruptive to always have to commit lot's of files because their properties changed - even if nothing happened to the file)
Merge methods and the application of svn:mergeinfo is done using the
subversion libraries so you have to ask this on the subversion users
mailing list. Just to check, are you using the latest version of
client and server? Some of the mergeinfo change was reduced in the
1.6. release.
Simon
--
: ___
: oo // \\ "De Chelonian Mobile"
: (_,\/ \_/ \ TortoiseSVN
: \ \_/_\_/> The coolest Interface to (Sub)Version Control
: /_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2244857
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-05-14 00:38:28 CEST