[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 13:33:49 CET

> -----Original Message-----
> From: Stefan Küng [mailto:tortoisesvn@gmail.com]
> Sent: Dienstag, 7. Februar 2006 12:55
> To: users@tortoisesvn.tigris.org
> Subject: [SPAM] - Re: Merge local file diffs - Email contains a url listed
> on multi.surbl.org
> On 2/7/06, Sven Kirchner <Sven.Kirchner@innomea.com> wrote:
> > That's exactly the problem. If I had any means of controlling the files
> > I receive I wouldn't be in this trouble.
> Just don't apply changes if they don't send you correct patches. Send
> them back with a note that they should send proper patchfiles. After
> two or three times, they will learn (if they don't, then you shouldn't
> apply their changes anyway because they lack learning capabilities).

Yea I'm SOL here. I can always refuse those kinds of patches, but if the other side is just unwilling to understand this won't help. It will just mean that I do not get any patches anymore which will only hurt myself. So what I am trying to do here is get the best out of the files. That's why I asked my initial question if there is some kind of possibility within TSVN to help here.

It would probably work if I create a temporary branch, check in (overwrite) the files I was sent and do a merge from there. But that doesn't really feel right.

> > PS: Just curious, never used the patch feature of TSVN. It contains a
> > revision number?
> Yes, the revision number the files were at when the patch is created.
> Try it for yourself: modify some files, right click on the parent
> folder, choose "create patch" from the context menu.


To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Feb 7 13:34:05 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.