Comments on: SVN Merging and change histories http://blog.constantconfusion.com/2008/07/10/svn-merging-and-change-histories/ The brain dump of a web developer Tue, 06 Jan 2009 22:40:22 +0000 http://wordpress.org/?v=2.6.2 By: raZorTT http://blog.constantconfusion.com/2008/07/10/svn-merging-and-change-histories/#comment-74 raZorTT Wed, 16 Jul 2008 03:46:49 +0000 http://blog.constantconfusion.com/?p=22#comment-74 Hi Geoff, You guy must do a lot of merging with the various versions of farcry? Is there any way that you can think to get that history into the trunk? I guess a copy of sorts? Thanks for the link I'll keep an eye on it! Cheers, Simon Hi Geoff,

You guy must do a lot of merging with the various versions of farcry? Is there any way that you can think to get that history into the trunk? I guess a copy of sorts?

Thanks for the link I’ll keep an eye on it!

Cheers,

Simon

]]> By: Geoff Bowers http://blog.constantconfusion.com/2008/07/10/svn-merging-and-change-histories/#comment-72 Geoff Bowers Wed, 16 Jul 2008 01:02:52 +0000 http://blog.constantconfusion.com/?p=22#comment-72 Subversion merges don't carry history. This may change with the release of SVN 1.5 and the "Merge tracking" feature. But its early days yet. http://subversion.tigris.org/svn_1.5_releasenotes.html#merge-tracking Subversion merges don’t carry history. This may change with the release of SVN 1.5 and the “Merge tracking” feature. But its early days yet.
http://subversion.tigris.org/svn_1.5_releasenotes.html#merge-tracking

]]>