subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Thorsten Schöning <>
Subject Re: Keyword substitutions not being merged correctly
Date Wed, 20 Mar 2013 17:47:44 GMT
Guten Tag David Sandberg,
am Mittwoch, 20. März 2013 um 18:17 schrieben Sie:

> 4) Now, Sam merges trunk revision 200 into his feature branch.  The
> merge happens automatically without prompts for conflicts or
> anything, and the resulting file A contains MOST of the changes from
> the trunk revision ... EXCEPT for the Revision keyword, which stays at 101!

Those keywords are substituted only by the client after the commit,
there are not part of the merge and therefore the old values persist
until a commit is made. During updates the keyword is updated because
something has changed for this file, but again from the client and the
keyword is not part of the data in the repo.

> Because we have business logic that depends upon these revision
> numbers being merged properly, this problem has a segment of our
> company actively talking about switching back to VSS, for goodness
> sake, so if anyone has a solution for this I would be very
> appreciative.

I think you misunderstood the concept of those keywords.

> Several of the preceding descriptions use the phrase “last known” or
> similar wording. Keep in mind that keyword expansion is a
> client-side operation, and your client “knows” only about changes
> that have occurred in the repository when you update your working
> copy to include those changes. If you never update your working
> copy, your keywords will never expand to different values even if
> those versioned files are being changed regularly in the repository.

Mit freundlichen Grüßen,

Thorsten Schöning

Thorsten Schöning
AM-SoFT IT-Systeme

Telefon...........05151-  9468- 55
Fax...............05151-  9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow

View raw message