[svk-users] push /pull problem

[Jesse Vincent]

On Apr 12, 2008, at 7:52 PM, David Morton wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I have mirrored a remote repo, and then checked out a branch from the
> mirror:
>
> #svk info
> Checkout Path: /Users/dgm/workspace/maia-svk-1.0
> Depot Path: //mirrors/maia/branches/1.0
> Revision: 1456
> Last Changed Rev.: 1456
> Mirrored From: https://www.maiamailguard.com/svn, Rev. 1222
> Copied From: /mirrors/maia/trunk, Rev. 1267
> Merged From: /mirrors/maia/trunk, Rev. 1267
> Merged From: /local/maia/trunk, Rev. 1262
>
>
> When I push a set of changes, it uploaded the new changes, and then
> appears to try to pull changes from the remote server.  The same thing
> happens when I try svk pull:  It tries to pull changes from the trunk
> into the branch; not what I want it to do.
>

Likely, you want to

svk cp //mirrors/maia/branches/1.0 //local/maia-1.0

and then work on the local branch. What you've been doing up to now is  
working on a direct checkout of the mirrored branch. In the svk world  
"mirrored" branches should be exact clones of the remote trees which  
they mirror. So any change should be applied to the remote tree first  
and then copied down.


"svk help intro" should describe the "right" workflow.

Does that make sense?

-jesse



> IOW, It tries to merge https://www.maiamailguard.com/svn/trunk into my
> branches/1.0 path.  Did I do something wrong?
>
>
> David Morton
> Maia Mailguard http://www.maiamailguard.com
> mortonda at dgrmm.net
>
>
>
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.7 (Darwin)
>
> iD8DBQFIAUtJUy30ODPkzl0RAj30AJwLCsUcBGRGAa5qspztiQJaRkRHHwCgu6Sz
> EnBl/tEuPfIgVg17Ozh5xWU=
> =mTEZ
> -----END PGP SIGNATURE-----
> _______________________________________________
> svk-users mailing list
> svk-users at lists.bestpractical.com
> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-users
>

-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
Url : http://lists.bestpractical.com/pipermail/svk-users/attachments/20080428/89aeddea/attachment.pgp