[svk-users] smerge between depotpaths

[Shoan Motwani]

Any thoughts on this issue?

Peace,
Shoan.


On 27-Dec-07, at 12:05 PM, Shoan Motwani wrote:

>
> On 26-Dec-07, at 10:23 PM, Jesse Vincent wrote:
>>>
>>> How do I merge the new changes from //proj/phase2 to //proj/new?
>>>
>>
>> Does:
>> 	svk sm //proj/phase2 //proj/new
>>
>> Do what you mean?
>>
>
> Here's what I have done so far.
>
> Nirvana:~/Sites/dwcnew/projects shoan$ svk info
> Checkout Path: /Users/shoan/Sites/dwcnew/projects
> Depot Path: //dwc/new/projects
> Revision: 1712
> Last Changed Rev.: 1711
> Mirrored From: http://fluke/svn/dwc/trunk, Rev. 790
>
> Nirvana:~/Sites/dwcnew/projects shoan$ svk up
> Syncing //dwc/new/projects(/dwc/new/projects) in /Users/shoan/Sites/ 
> dwcnew/projects to 1712.
> Nirvana:~/Sites/dwcnew/projects shoan$ svk status
> Nirvana:~/Sites/dwcnew/projects shoan$
>
>
>
> Nirvana:~/Sites/dwcsvk/oct1/projects shoan$ svk info
> Checkout Path: /Users/shoan/Sites/dwcsvk/oct1/projects
> Depot Path: //dwc/oct1/projects
> Revision: 1712
> Last Changed Rev.: 1712
> Copied From: /dwc/phase2/projects, Rev. 775
> Merged From: /dwc/phase2/projects, Rev. 775
> Nirvana:~/Sites/dwcsvk/oct1/projects shoan$ svk up
> Syncing //dwc/oct1/projects(/dwc/oct1/projects) in /Users/shoan/ 
> Sites/dwcsvk/oct1/projects to 1712.
> Nirvana:~/Sites/dwcsvk/oct1/projects shoan$ svk status
> Nirvana:~/Sites/dwcsvk/oct1/projects shoan$
>
>
>
> Nirvana:~/Sites/dwcsvk/oct1/projects shoan$ diff -rq ~/Sites/dwcsvk/ 
> oct1/projects ~/Sites/dwcnew/projects |wc
>       16      75    2685
>
> Nirvana:~/Sites/dwcsvk/oct1/projects shoan$ svk mirror -l
> Path           Source
> ====================================================================== 
> ===============
> //dwc/new      http://localhost/svn/dwc/trunk
> //dwc/phase2   svn+ssh://smotwan@server/usr/local/svn/amazon/ 
> branches/phase2
>
> Nirvana:~/Sites/dwcsvk/oct1/projects shoan$ svk sm //dwc/phase2 // 
> dwc/new
> Auto-merging (916, 916) /dwc/phase2 to /dwc/new (base /dwc/oct1:913).
> Empty merge.
>
>
> As the diff indicates there are files with changes in //dwc/phase2,  
> but I am not able to merge them to //dwc/new.
>
> Peace,
> Shoan.
>
> _______________________________________________
> svk-users mailing list
> svk-users at lists.bestpractical.com
> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-users