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

Re: unifying multiple files and their log messages

From: Branko Čibej <brane_at_xbc.nu>
Date: 2002-08-29 20:11:24 CEST

Ben Collins-Sussman wrote:

>Philip Martin <philip@codematters.co.uk> writes:
>>>still a merge in my book. And merge should carry the possibility for
>>>displaying log messages from the merged source as well - like is
>>I agree, this looks like a case of storing merge history. ClearCase
>>also stores merge history. It usually happens automatically when you
>>merge a file, but there are also commands to manually add and remove
>>merge history without merging the file contents. These commands just
>>manipulate the meta-data.
>cmpilato and I were discussing this yesterday. Assuming that someday
>we record merge history by adding information to certain
>properties... then someday 'svn log' could also learn to parse those
>properties and show log messages for the merged history as well.

Well, well, well. There used to be a time when I proposed "svn join",
that would do exactly that -- join revision histories (from two branches
or two separate nodes). And got jumped on "because that's the same as a
merge + delete". Just like move is copy+delete, which we're regretting now.

Heh heh. Sooner or later they always realize that I was right all the
time. Go me! :-)

Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 29 20:12:03 2002

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.