[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: Travis P <svn_at_castle.fastmail.fm>
Date: 2004-05-03 18:02:21 CEST

On May 3, 2004, at 10:48 AM, John Peacock wrote:

> 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:
> http://svk.elixus.org/
> It does require a private local repository to mirror the remote
> repository. See in particular the Tutorial page for daily usage
> examples.

Thanks for the suggestion. I think svk is an interesting project, but
it is not the right solution in my environment. Most obviously, local
repositories aren't appropriate as developers use networked filesystems
for almost everything (our cental Subversion repository being a
particular exception).


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 3 18:03:10 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.