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

AW: Merge with svn:keywords

From: Rainer Schmidt <RSchmidt_at_advaoptical.com>
Date: 2004-08-31 10:09:59 CEST

Original both files had no properties


-----Ursprüngliche Nachricht-----
Von: Max Bowsher [mailto:maxb@ukf.net]
Gesendet: Dienstag, 31. August 2004 10:02
An: Rainer Schmidt; users@subversion.tigris.org
Betreff: Re: Merge with svn:keywords

Rainer Schmidt wrote:
> Hi,
> is this behavior o.k.?
> I have a file xxx in the trunk with property svn:keywords = Id.
> The same file in branch has svn:keywords = Date.
> I merge the branch into the trunk and there is no conflict.
> After merge the file in trunk has property svn:keywords = Date. !!!

It's ok if-and-only-if at some point on the branch, the property changed
value from "Id" -> "Date", in which case, that change was merged to trunk.

However, I have a suspicion that this may not be the case - I have a feeling

this might be an alternate symptom of a piece of underlying bad design in
libsvn_wc/libsvn_client that I have recently been investigating.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Aug 31 10:11:06 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.