[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: BUG: Record Only Merge modified Working Copy

From: object01 <object01_at_gmail.com>
Date: Wed, 27 Aug 2008 08:56:12 -0700 (PDT)

But the operation does modify the contents of the files. My working copy is
filled with all the left/right files you'd expect to see result from the
conflict, and my source files contain the "<<<<<<"/">>>>>>" annotations that
normally result from a conflict. Plus, new files appear and deleted files
are removed. It's my understanding that in an "Only record the merge"
scenario, none of these modifications should occur; only the relevant
svn:mergeinfo properties should be added/updated.

Jeff S.
Stefan Küng wrote:
> You misunderstand the option. "Only record the merge" means: do the
> merge without modifying the contents of the files, but record the merge
> as if it really has happened. That means the svn:mergeinfo properties
> are modified, as well as the merge tracking db on the server.
> This is used to mark revisions as merged so they won't get merged again
> in the future without actually doing the merge.
> A common use case is to block revisions from getting merged.
> What you may want to do it to use the "Test merge" button instead.
> Stefan
> -- 
>        ___
>   oo  // \\      "De Chelonian Mobile"
>  (_,\/ \_/ \     TortoiseSVN
>    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
>    /_/   \_\     http://tortoisesvn.net
View this message in context: http://www.nabble.com/BUG%3A-Record-Only-Merge-modified-Working-Copy-tp18225002p19184012.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-08-27 17:56:20 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.