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

Re: svn up --paranoid [was "Disabling automatic conflict resolution" ]

From: Jay Freeman \(saurik\) <saurik_at_saurik.com>
Date: 2003-08-18 19:41:32 CEST


This doesn't quite work because, as someone else mentioned (cmpilato I
think?) changes that were the same both locally and remotely are destroyed
during this process. The information content is lost as no one bothers to
record it. The way Subversion currently stands (unlike CVS, which is an
important note; see my e-mail on the other thread), you can't recover from a
merge process if it went horribly wrong.

Jay Freeman (saurik)

----- Original Message -----
From: <kfogel@collab.net>
To: "Wadsworth, Eric (Contractor)" <wadswore@fhu.disa.mil>
Cc: <cmpilato@collab.net>; <james-tigris@jrv.org>;
<users@subversion.tigris.org>; <dev@subversion.tigris.org>
Sent: Monday, August 18, 2003 10:01 AM
Subject: Re: svn up --paranoid [was "Disabling automatic conflict
resolution" ]

> That's not true. Consider:
> $ svn up
> G foo.txt <-- oh no, repos changes merged into modified local copy
> $ svn diff foo.txt > my-adjusted-changes.txt
> $ svn up -r<EARLIER_REV> foo.txt
> G foo.txt
> $
> -Karl

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 18 19:43:48 2003

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.