On 11/6/07, Hari Kodungallur <hkodungallur@gmail.com> wrote:
>
>
> On Nov 6, 2007 11:57 AM, Andrew Sasak <sasakand@msu.edu> wrote:
>
> > I am wondering if the "cheap copies" are used when merging changes from a
> modified file on a branch to an unmodified file on the trunk (or vice
> versa). Since my question might not be clear consider the following
> scenario:
> > (I acknowledge that this is an extreme example)
> > A branch is created.
> > Changes are made to a relatively small number of files (lets say 1 file)
> and committed to the branch.
> > Time goes by with 100's of files changed/added on the trunk.
> > Meanwhile the branch has been untouched.
> > The branch creator wants to continue using the branch, but would like to
> merge all the changes from the trunk into the branch.
> >
> > Does this merge use "cheap copies" to create the new revisions of the
> files on the branch, or does branching prevent the usage of hardlinks?
>
>
> I think it depends on the change. For files and directories that are added
> in the trunk, they are cheap copies. But any modification to an existing
> file is a local change to the file after the merge. That is they are not
> cheap copies.
That's correct. However the changes are stored as a delta against the
old version, meaning that storage should be expected to be quite
efficient there too.
HTH,
Erik.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 6 21:18:55 2007