merge conflict terms

On 08.12.2014 14:11, Niemann, Hartmut wrote:
> Hello!
>
> As a sequel to this discussion:
>
> I had to merge between to folders inside my working copy.
> In such a setup there is nothing like "choose local" and "choose repository".
> I was confused, but as far as I can tell I guessed right...
>
> When I merge form /030_branches/my_workingbranch
> to /040_trunk inside my working copy, what does "repository" mean? Which is which?
>
> Would "present" and "incoming" or "destination" and "source" be more appropriate words?

The terms "local" and "repository" are the same as the svn client uses,
so at least that's an advantage: users are familiar with it (at least
those who use multiple svn clients, and those reading the svn docs).

But I'm open to better terms if there are any. Your suggestions are not
bad, but at least I can't tell which is which. Tell me if I'm right or
wrong:

"present" : working copy file (with possible local mods)
"incoming" : file from the repository, containing the merge changes

"destination" : same as "present"
"source" : same as "incoming"

Also, there's another problem:
if a merge that spans over multiple revisions is done, the first
revisions might not cause a conflict but leave the wc file modified
(i.e., that part of the merge is already done). Now if further revisions
cause a merge conflict, there are local modifications already but
they're not really local but the successful merges. So it gets even more
complicated: "local" then means the already merged parts too.

So, who else has an opinion on what terms we should use?

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=3092409
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].