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

AW: Problem merging with svn:keywords (solved)

From: Volker <sanam_dry_chili_at_yahoo.de>
Date: Mon, 17 Mar 2008 23:30:16 +0000 (GMT)

Hi all, the developer checked in a property change within that commit - wonder how he could get a successful commit. Indeed replaying the transaction in svn-1.5 gives no conflict aftert merging. Thanks and Greetings Volker ----- Ursprüngliche Mail ---- Von: Andy Levy <andy.levy_at_gmail.com> An: Volker <sanam_dry_chili_at_yahoo.de> CC: users_at_subversion.tigris.org Gesendet: Sonntag, den 16. März 2008, 17:41:48 Uhr Betreff: Re: Problem merging with svn:keywords On Sat, Mar 15, 2008 at 11:52 PM, Volker <sanam_dry_chili_at_yahoo.de> wrote: > > Dear List, > > for a build I had to merge the following diff (Revision and Date are set > with svn:keywords property) > > - * @version 2.0.0 $Revision:$ > - * @since $Date:$ > + * @version 2.0.1 $Revision$ > + * @since $Date$ > > and got a conflict. Has someone an idea why ? As I tested, the colon in the > keyword expansion does not matter ... Your @version lines differ in a section which isn't touched by the keywords (2.0.0 vs. 2.0.1). I think the colons in the keywords themselves do matter in this case with regard to the merge. --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org For additional commands, e-mail: users-help_at_subversion.tigris.org Lesen Sie Ihre E-Mails jetzt einfach von unterwegs. www.yahoo.de/go
Received on 2008-03-18 00:30:46 CET

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.