Re: Copying BASE revision of WC path

> Your summary question at the end reverses the order of the two
> proposed behaviors you listed,

Hmmm, how very inconsistent of me.

> [...] it should be (1) -- copy the complex mixed revisions,
> switches, etc. And if you eliminate the "-rBASE", it should apply
> your local mods after doing copies of the base revisions

Yup, put that way, the behaviour in (1) sounds consistent and just
what one would expect from "-rBASE".

> in other words, technically it should be possible to recover your
> local diff from a branch created with:
>
> $ svn cp . svn://somehost/somerepo/branches/mybranch

It isn't obvious to me how you would recover this information. When I
look at the log for a copy operation on a WC containing a file with
local modifications, I see this:

  Changed paths:
     A /branches/mybranch (from /trunk:10)
     M /branches/mybranch/foo

Here, it is obvious that foo had local changes, but what was its BASE
revision? Or is this meant to be interpreted as foo's BASE being the
same as its parent, i.e. r10?

My plan was to create the branch with two commits:

  % svn cp -rBASE . svn://somehost/somerepo/branches/mybranch
  % svn switch svn://somehost/somerepo/branches/mybranch
  % svn commit

This way it would be trivial to recover the initial local changeset,
just by diffing the first and the second commits on the branch.

- Tor Ringstad -

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 23 02:50:19 2007