[svk-devel]what should I do if I recreate a mirror for merging?

Tony Wu wuyuehao at gmail.com
Thu Feb 1 07:15:41 EST 2007


I run svk log //mirror | grep $date and got the merge base. After a
successful smerge with specified base, all things goes well.

thank you all for help :)

On 2/1/07, Michael Brouwer <mb.7766 at gmail.com> wrote:
> Just leave off the -B argument all but the first time you do a smerge.
>
>
> On 1/31/07, Tony Wu <wuyuehao at gmail.com > wrote:
> > Hi Viktor,
> >
> > I'm not quite sure what will be done if I specify a merge base. the
> > base should be the revision of source depot or dest depot? can you
> > give me an example on how it works? thank you very much.
> >
> > On 1/31/07, Viktor Štujber <theultramage at gmail.com > wrote:
> > > Hmm, you're doing a baseless merge each time. Why not specify the merge
> base?
> > > _______________________________________________
> > > svk-devel mailing list
> > > svk-devel at bestpractical.com
> > >
> http://lists.bestpractical.com/cgi-bin/mailman/listinfo/svk-devel
> > >
> >
> >
> > --
> > Tony Wu
> > China Software Development Lab, IBM
> > _______________________________________________
> > 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
>
>
>


-- 
Tony Wu
China Software Development Lab, IBM


More information about the svk-devel mailing list