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

Re: Translating 'record only'

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2007-07-09 12:08:23 CEST

On 7/9/07, Simon Large <simon.tortoisesvn@googlemail.com> wrote:
> On 09/07/07, Lübbe Onken <l.onken@rac.de> wrote:
> > Hi Folks,
> >
> > What's the meaning of 'record only' A quick grep on the resource files
> > didn't reveal the location of this string to me.
>
> Stefan just added this to the merge-tracking support. If you have
> already done a lot of merging without using the merge-tracking, I
> think the idea is to do a 'record only' run where you update the merge
> tracking variables, but don't actually change the file content
> (because you already did that earlier).

It can also be used to mark certain revisions as already merged, even
if you never intend to merge them. Kind of like a 'don't merge this'
mark.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Jul 9 12:08:01 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.