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

Re: option equivalent to cvs's -n

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-05-03 17:48:17 CEST

Travis P wrote:

> The useful information that 'cvs -n update' provides but 'svn status -u' does
> not is whether or not a conflict will occur. Knowing whether a conflict will
> occur prior to updating (or switching, the more general case) would be very
> useful. It lets me know how much time I might need to allocate fixing things
> up were I to update/switch. If there's no conflict, no time need be spend
> resolving conflicts.

You might check out svk, which has a smart merge feature including an explicit
check phase:


It does require a private local repository to mirror the remote repository. See
in particular the Tutorial page for daily usage examples.



John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4501 Forbes Boulevard
Suite H
Lanham, MD  20706
301-459-3366 x.5010
fax 301-429-5748
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 3 17:48:34 2004

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.