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

Re: [BUG] Conflict with use-commit-times = yes + svn:keywords set

From: Øyvind A. Holm <sunny_at_sunbase.org>
Date: 2004-11-02 03:13:14 CET

On 2004-11-02 02:46:21 Øyvind A. Holm wrote:
> darix has converted the irssi CVS repository to Subversion (yet
> another thing for the propaganda page, but that's another story) using
> the newest cvs2svn. cvs2svn set the svn:keyword for all revisions, and
> this in combination with "set-commit-times = yes" creates a conflict
> when updating to earlier revisions. When set-commit-times is "no",
> this does not happen. This happens with both newest trunk and 1.1.x .

One thing I'd add is that it's only files which contains a keyword that
get into a state of conflict. In the case of irssi, the only files with
keywords are /trunk/scripts/mail.pl and /trunk/irssi.spec.in , and both
of these creates a conflict.

-- ☮yvind

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Nov 2 03:13:46 2004

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