[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: Sven Kirchner <Sven.Kirchner_at_innomea.com>
Date: 2006-02-07 14:04:19 CET

> From: Kevin Greiner [mailto:greinerk@gmail.com]
> On 2/7/06, Sven Kirchner <Sven.Kirchner@innomea.com> wrote:
> >
> > Yea I'm SOL here. I can always refuse those kinds of patches, but if
> other side is just unwilling to understand this won't help.
> Is it a matter of education or capability? Any developer with the
> capability to modify source code should also be able to generate a
> patch. If not, write a nice generic email explaining how learning to
> do so is in their own best interests. I'm assuming they want their
> changes included in the next release of your product, of course.

Believe me, I have gone far explaining the situation. Having said that,
it is impossible to get the other side to do anything other than sending
copies of files.

> Now, assuming they won't coopereate but you still want the modified
> files so you can generate a diff. How are you going to know what
> version these files are? TSVN can't figure that out automatically. How
> about using $Id$ to embed a rev in a comment hearder in each source
> file?

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
| files. Like setting an old revision in the "From:" settings and the
| received files in the "To:" settings of the merge dialog. Is there
| 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 hope this makes at least some kind of sense to anyone.

To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org

Received on Tue Feb 7 14:04:39 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.