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

Merge local file diffs

From: Sven Kirchner <Sven.Kirchner_at_innomea.com>
Date: 2006-02-07 08:33:27 CET


I've ran into some issue a couple of times now. I receive a couple of
changed files of my project by email (I cannot change this). The base of
these changed files is some old revision (unknown) in the repository of
the project. I want to try and merge these changes into (the most
probably changed) repository.

Is there a best practice as to how to do this? 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?

Thanks in advance.

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