Accommodating Manual Change Logs In 'svn update' And/Or 'svn merge'
From: Eric Roesinger <ERoesinger_at_troygroup.com>
Date: Thu, 7 Apr 2011 15:03:41 -0400
If I happen to have duplicated a previous proposal, I would appreciate
The reasons for not supporting the equivalent of the CVS $Log$ keyword
However, there are legitimate reasons for developers to include manual
To resolve such "log conflicts" manually, I will typically concatenate
Since this is a more-or-less mechanical process, it seems, to me, like
Note these keywords would be positional merge hints only: there would
Also, it would be appropriate still to refuse commits, until after the
Of course, these would have to appear in 'svn:keywords': if both were
-- Eric Roesinger : Senior Firmware Engineer eroesinger_at_troygroup.com : TROY Group, Inc. Tel#: 304 232-0899 x114 : 3 Bryan Drive FAX#: 304 232-1028 : Wheeling, WV 26003 USAReceived on 2011-04-07 22:49:53 CEST
This is an archived mail posted to the Subversion Users mailing list.