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

Re: [merge-tracking] question about wc to repos copyfrom info

From: Daniel Rall <dlr_at_collab.net>
Date: 2006-12-21 23:10:47 CET

On Thu, 21 Dec 2006, Madan S. wrote:
...
> When the working copy path which is given as source contains mixed
> revisions, and further more has local changes, what should be the
> copyfrom information?

Even when there are local changes, the copyfrom info corresponds to
the pristine state of the WC.

> Am trying to figure out what exactly gets copied to the repository.

The modified content is what's copied to the repository (an additional
delta on the pristine state of the WC).

> This would give me clarity on what should be stored
> in the copyfrom info.
>
> Is this the right approach? Thoughts, Ideas, suggestions?

It sounds like you might be talking about merge info for the copy
source(s), rather than copyfrom info. I think that merge info for the
copy source(s) should work the same way.

  • application/pgp-signature attachment: stored
Received on Thu Dec 21 23:12:17 2006

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