[svk-devel] Can I merge two svn branches in svk?

[Ruslan Zakirov]

I think if svn://mainrepo.com/branches/dev-b is copy of
svn://mainrepo.com/branches/dev-a in the main repo then it's bug in
SVK.

On 2/26/07, Chia-Liang Kao <clkao at clkao.org> wrote:
> Try --baseless for the smerge. or even better, if you know where those
> two branches had common ancestor, say trunk r123, use --base
> //mirror/trunk:123
>
> On 26/02/07, Badai Aqrandista <badaiaqrandista at gmail.com> wrote:
> > Hi,
> >
> > I have two branches on my SVN repository, just say /branches/dev-a and
> > /branches/dev-b.
> >
> > Now I want to start using SVK. Is it possible to merge both branches
> > in an SVK local branch? Following is the steps of the failed attempt
> > that I've tried. I can't think of any other ways to do it.
> >
> > First, I set up the mirror repos:
> >
> > $ svk mkdir //mirror
> > $ svk mirror svn://mainrepo.com/branches/dev-a //mirror/dev-a
> > $ svk sync //mirror/dev-a
> > $ svk mirror svn://mainrepo.com/branches/dev-b //mirror/dev-b
> > $ svk sync //mirror/dev-b
> >
> > Then, I create the local branch:
> >
> > $ svk mkdir //local
> > $ svk cp //mirror/dev-a //local/dev-merged
> >
> > Then I do the merge:
> >
> > $ svk smerge //mirror/dev-b //local/dev-merged
> >
> > The last step failed with message: "Can't find merge base for
> > /mirror/dev-b and /local/dev-merged"
> >
> > Can anyone point out what I should do to merge //mirror/dev-a and
> > //mirror/dev-b into //local/dev-merged?
> >
> > --
> > Thanks,
> > Badai Aqrandista (cheepy)
> > _______________________________________________
> > svk-devel mailing list
> > svk-devel at bestpractical.com
> > http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel
> >
> _______________________________________________
> svk-devel mailing list
> svk-devel at bestpractical.com
> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel
>


-- 
Best regards, Ruslan.