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

Re: Import and Commit and file modification times

From: Michael Sinz <Michael.Sinz_at_sinz.org>
Date: 2005-08-20 14:25:30 CEST

Svante Seleborg wrote:

>>You asked for a case where keeping the latest property value
>>would be bad.
>>There were two copies of the file with identical timestamps,
>>then the one on the trunk is changed causing its timestamp to
>>update. This change is then merged into the branch causing
>>that file to change and its timestamp to update. However,
>>when merged back into the trunk the two files are identical
>>except for the timestamps.
> No, the timestamps are identical.
> Someone updates a working copy, and commits to the trunk. This working copy
> and the trunks metadata timestamp are now identical.
> The change is merged into the branch, causing that file to change and it's
> timstamp updated to the the same value as the other representations of the
> file. The same timestamp is now present in three places - all identical.

Why would that be? If I merge something from one branch (trunk) to another,
there is nothing that says that the two files (as in text/code/etc) will
now be identical. I just merged the changes from that one branch into
the other and thus the two files may still not be the same. Would not
the timestamp of the newly merged file be the time at which I did
the merge? Just as if I hand edited those changes into the file?


Michael Sinz                     Technology and Engineering Director/Consultant
"Starting Startups"                                mailto:michael.sinz@sinz.org
My place on the web                            http://www.sinz.org/Michael.Sinz
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Aug 20 14:26:21 2005

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.