[svk-devel] Star Merge cannot find base

[G. Richard Bellamy]

Attached.

-----Original Message-----
From: svk-devel-bounces at bestpractical.com [mailto:svk-devel-bounces at bestpractical.com] On Behalf Of Chia-Liang Kao
Sent: Sunday, March 11, 2007 3:32 PM
To: svk-devel at bestpractical.com
Subject: Re: [svk-devel] Star Merge cannot find base

On 11/03/07, G. Richard Bellamy <rbellamy at visient.com> wrote:
> I mirrored a repo to //mirror/Castle
>
> I copied //mirror/Castle/trunk to //local/Castle/trunk
>
>
>
> And now Star Merge is telling me that it can't find the base. Very clearly
> the local copy does have a common base, so I'm not quite sure what to do.
>
>
>
> (Sun 03/11/2007 14:20:52.79)
>
> D:\Development>svk sm -I -l //mirror/Castle/trunk //local/Castle/trunk
>
> Can't find merge base for /mirror/Castle/trunk and /local/Castle/trunk


that looks indeed quite odd.  what version of svk? and can you run:
svk pl -v //mirror/Castle/trunk //local/Castle/trunk ?

Cheers,
CLK
_______________________________________________
svk-devel mailing list
svk-devel at bestpractical.com
http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel

-------------- next part --------------
(Sun 03/11/2007 16:45:50.86)
D:\Development>svk pl -v //mirror/Castle/trunk //local/Castle/trunk
Properties on //mirror/Castle/trunk:
  bugtraq:logregex: [A-Z]+-\d+
[A-Z]+-\d+
  bugtraq:url: http://support.castleproject.org/browse/%BUGID%
  fisheye.access: allow
  svn:ignore: proposal.txt
articles
bin
obj
docs
*.suo
*.user
*.resharperoptions
Thumbs.db
build
test-results
samplesforwebsite

  svnmerge-blocked: /branches/1.0.x:2507-2508,2578
  svnmerge-integrated: /branches/1.0.x:1-2487,2509-2514,2516-2527,2537-2538,2540-2559,2562-2577,2579,2581-2597,2599-2639,2654,2657,2664-2665,2669-2681,2684-2694,2696-2703,2708-2720,2722-2748,2750-2762,2764-2768,2770-2771,2773-2778,2780,2783-2793,2800-2804,2808-2814,2816-2840,2842-2857,2859-2861,2875-2879
  tsvn:projectlanguage: 1033
Properties on //local/Castle/trunk:
  bugtraq:logregex: [A-Z]+-\d+
[A-Z]+-\d+
  bugtraq:url: http://support.castleproject.org/browse/%BUGID%
  fisheye.access: allow
  svn:ignore: proposal.txt
articles
bin
obj
docs
*.suo
*.user
*.resharperoptions
Thumbs.db
build
test-results
samplesforwebsite

  svnmerge-blocked: /branches/1.0.x:2507-2508,2578
  svnmerge-integrated: /branches/1.0.x:1-2487,2509-2514,2516-2527,2537-2538,2540-2559,2562-2577,2579,2581-2597,2599-2639,2654,2657,2664-2665,2669-2681,2684-2694,2696-2703,2708-2720,2722-2748,2750-2762,2764-2768,2770-2771,2773-2778,2780,2783-2793,2800-2804,2808-2814,2816-2840,2842-2857,2859-2861,2875-2879
  tsvn:projectlanguage: 1033

(Sun 03/11/2007 16:45:59.40)
D:\Development>