[Module::Build] svk pulling
Status: Beta
Brought to you by:
kwilliams
From: Ken W. <ke...@ma...> - 2006-04-20 16:38:40
|
Hey, I'm having some kind of problem with SVK I'm not sure how to handle. I wanted to go into the release-0_26_branch and maybe make a bug fix, so I went to my working directory: % svk info Checkout Path: /Users/ken/src/Module-Build-svk-0.26 Depot Path: //mirror/module-build/branches/release-0_26_branch Revision: 1874 Last Changed Rev.: 1828 Mirrored From: https://svn.perl.org/modules/Module-Build, Rev. 5932 Copied From: /mirror/module-build/trunk, Rev. 1147 Merged From: /mirror/module-build/trunk, Rev. 1147 % svk mirror --list Path Source ============================================================ //mirror/module-build https://svn.perl.org/modules/Module-Build /module-build/mirror http://svn.perl.org/modules/Module-Build (Ignore that second mirror, I don't use it and I want it to go away.) When I perform "svk pull" in /Users/ken/src/Module-Build-svk-0.26 , I get notified of a lot of conflicts. I figure, whatever, I haven't ever made changes in this directory, so I "accept theirs" for all the conflicts, thinking that will just get me a fresh version of stuff. But then if I do "svk pull" again in the same directory, I get the same set of conflicts. Help? -Ken |