Concerning Re: Merging non-versioned directory
jhanley_at_dgtlrift.com wrote on 27 Oct 2008, 10:24, at least in part:
> Quoting Trevor Harmon <trevor_at_vocaro.com>:
>
> > Hi,
> >
> > Occasionally I come across an unfortunate scenario where I've got
> > two copies of a directory: an old one checked into a repository, and
> > a newer one that happens to exist entirely outside of Subversion
> > (not in a repository or working copy). The new one has just a few
> > scattered changes compared to the old one.
If you are working under Windows you might try WinMerge. It can
compare whole directories (though not whole trees afaik) and lists
the files which are different or exist only on one side. You can
compare those then in particular for each difference and decide
what to take and what to ommit. This involves manual work of
course, but for "a few scattered changes" it should be comfortable
enough with WinMerge.
http://sourceforge.net/projects/winmerge
Jan Hendrik
---------------------------------------
Freedom quote:
Die neue Toleranz duldet nichts mehr außer sich selbst.
Vielfalt verspricht sie, aber tatsächlich fordert sie viel mehr:
nicht mehr eine Tugend des zivilen Umgangs, der Duldsamkeit
gegenüber anderen Formen des Zusammenlebens, sondern die
gesellschaftliche Marginalisierung der "Intoleranten".
-- Lorenz Jäger, Homintern,
Frankfurter Allgemeine Zeitung, 3. August 2007
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-10-27 17:41:56 CET