[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-02-07 12:55:11 CET

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).

> 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.

Stefan

--
       ___
  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 12:55:22 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.