On Tue, Oct 07, 2003 at 12:23:16PM +0100, José Fonseca wrote:
> On Tue, Oct 07, 2003 at 12:33:49PM +0200, Felix Kühling wrote:
> > Hi all,
> >
> > I'm happy to report that I found a solution to the merge problems Eric
> > and I were seeing. I believe the problem had to do with vendor branches.
> >
Michel Dänzer wrote:
On Tue, 2003-10-07 at 13:32, Keith Whitwell wrote:
Hmm. These problems only arise because of the way the merge was done? Why
not just document the right way to do the merge?
I think tagging the branch point is a good idea regardless.
I agree. Documenting both the right way
On Tue, 2003-10-07 at 13:32, Keith Whitwell wrote:
>
> Hmm. These problems only arise because of the way the merge was done? Why
> not just document the right way to do the merge?
I think tagging the branch point is a good idea regardless.
--
Earthling Michel Dänzer \ Debian (powerpc), X
> > Hmm. These problems only arise because of the way the merge was done? Why
> > not just document the right way to do the merge?
>
I'd agree with Keith the proper way to merge needs documenting, CVS vendor
import is what is needed, the XFree CVS is vendor imported into our DRI
tree, the chang
On Tue, 07 Oct 2003 12:32:45 +0100
Keith Whitwell <[EMAIL PROTECTED]> wrote:
> José Fonseca wrote:
> > On Tue, Oct 07, 2003 at 12:33:49PM +0200, Felix Kühling wrote:
> >
> >>Hi all,
> >>
> >>I'm happy to report that I found a solution to the merge problems Eric
> >>and I were seeing. I believe th
José Fonseca wrote:
On Tue, Oct 07, 2003 at 12:33:49PM +0200, Felix Kühling wrote:
Hi all,
I'm happy to report that I found a solution to the merge problems Eric
and I were seeing. I believe the problem had to do with vendor branches.
They are created automatically when sources are imported using
On Tue, Oct 07, 2003 at 12:33:49PM +0200, Felix Kühling wrote:
> Hi all,
>
> I'm happy to report that I found a solution to the merge problems Eric
> and I were seeing. I believe the problem had to do with vendor branches.
> They are created automatically when sources are imported using cvs
> impo
Hi all,
I'm happy to report that I found a solution to the merge problems Eric
and I were seeing. I believe the problem had to do with vendor branches.
They are created automatically when sources are imported using cvs
import. Many files from XFree86 had a vendor branch (e.g. revisions
1.1.1.x) wi
