[svk-devel] svk merge, problem w/ copied path in local branch
mark at stateful.net
Wed May 30 20:23:37 EDT 2007
If I'm reading this correctly (lost in the letters :)) it sounds like
the classic branch problem. You need to merge from the time you
branched to the head revision and not the latest branch against the
latest trunk or you will get more changes then you bargained for. It
sounds like you should be using svk merge so you can pick the start
revision of the compare.
On 5/30/2007, "Mark Lundquist" <lundquist.mark at gmail.com> wrote:
>I ran into a problem today and I wonder if anyone knows what is causing
>1) A while back I copied a path within a remote repository which I am
>mirroring locally. I don't remember whether I made the copy directly
>in the remote repository using svn, or made the copy in my mirror and
>then synced... but it was one or the other. I'll call the original
>path 'O' new copy 'N', and my mirrored version of 'N', 'MN'.
>2) I made a local development branch by copying 'MN'... call this new
>path 'L'. It exists only in my local repository.
>3) Checked out a bunch of changes in a working copy of L.
>4) Did a "svk pull" in the L working copy, to pick up intervening
>changes from N.
>5) Did "svk push" from the L working copy.
>When I did this, something bad happened... svk committed every change
>to N since its copy from O back to O! Essentially, it turned O into N.
>So, what is the deal? Any ideas?
>svk-devel mailing list
>svk-devel at bestpractical.com
More information about the svk-devel