[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: Ramón Zamora <ramonzamora_at_gmail.com>
Date: 2006-02-07 08:42:35 CET

if i understand you correctly you can checkout the old version and
then merge both files manually using an external compare tool. i
really hope this helps =)

On 2/7/06, Sven Kirchner <Sven.Kirchner@innomea.com> wrote:
> Hello,
>
> 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
>
>

--
Ramón Zamora
---------------------------------------------------------------------
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:42:40 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.