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

Re: Merge local file diffs

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-02-07 16:16:20 CET

Sven Kirchner wrote:
> I don't want TSVN to do anything automagically in that regard. Without
> wanting to get to deep into it, I can make an educated guess about the
> origin (revision-wise) of the file that will be almost always correct.
> Picking up my original question, this is what I was asking of TSVN:
> | I always wonder if its possible to somehow do a merge with the
> received
> | files. Like setting an old revision in the "From:" settings and the
> local
> | received files in the "To:" settings of the merge dialog. Is there
> some
> | kind of a way?
> Take a look at the fake imaginary screenshot (attached png). I specify a
> svnurl + revision in the from dialog and a local path.
> The local path is prepared like this: I have exported the revision
> specified in the From: setting and copied the received patched files
> into the dir (overwriting files).

I understand what you want, although it has nothing to do with
Subversion's concept of merging, so adding something to the merge dialog
would only confuse people. And honestly, why would we want to add a
feature to a Subversion client to help people who really don't want to
use Subversion at all?

I suggest you write yourself a script which uses TSVN's automation
interface to take the repetition out of the separate steps I suggested


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Feb 7 16:16:52 2006

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

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