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

Re: general question

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-03-15 16:17:38 CET

daniel@etrak-plus.com wrote:

> Is there anyway to force a users change into the repo over writing other
> changes?

I'm not sure I understand what you mean. Are you asking if a specific user can
commit their own changes _instead of_ merging with the existing repository copy?
    Normally, if the user doesn't have an up-to-date file, it will try and merge
with the repository.

But it's really very easy to get around that; copy the changed file out of the
way and then retrieve the current repository version. Then copy the changed
file back in to the WC and commit. As long as the WC has an up to date file,
the two copies will not be merged, but rather the WC copy will replace the
repository version.



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 Mar 15 16:17:45 2004

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