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

[Madan U S <ma...@collab.net>]

Hi,

   I have a question regarding the implementation of wc to repos copy 
for merge-tracking.

   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? Am trying to figure out what exactly gets copied 
to the repository. This would give me clarity on what should be stored 
in the copyfrom info.

    Is this the right approach? Thoughts, Ideas, suggestions?

Regards,
Madan.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

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

[Daniel Rall <dl...@collab.net>]

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.