[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merging third party source

From: Kaz Kylheku
Subject: Re: Merging third party source
Date: Fri, 12 Jul 2002 09:48:11 -0700 (PDT)

On Fri, 12 Jul 2002, Fredrik Svensson wrote:

> Date: Fri, 12 Jul 2002 09:17:09 +0200 (MEST)
> From: Fredrik Svensson <address@hidden>
> To: address@hidden
> Subject: [info-cvs] Merging third party source
> Dear all,
> I am trying to track a third party source and I had some problem with the
> latest import.
> I taged the tree as before_NEWVERSION
> unpacked the new sources.
> I imported the new sources as described in the manuals, with
> the tag NEWVERSION.
> cvs -q import project Company NEWVERSION
> I then did the
> cvs checkout -j before_NEWVERSION -j NEWVERSION project
> and it reported some mergers.

That is wrong, depending on what you mean by ``taggged the tree''.

The two versions you want to merge are both on the vendor branch.
So you should have tagged the vendor branch. But of course this 
isn't necessary because the import command forces you to specify a
tag which is applied to the branch.

So you should merge using that tag, e.g.

    cvs -q import project Company version-1-13

    cvs checkout -j version-1-12 -j version-1-13

The other alternative, assuming that it's been more than a day since
you imported the previous snapshot, is to just do:

    cvs checkout -j Company:yesterday -j Company

I.e. any changes since yesterday from the Company branch.

It sounds like what you did was merge the differences between 
your main trunk tip and the vendor branch tip, which of course
will obliterate any of your local changes, making your trunk
tip look like the branch one. If you add the difference (Y - X)
to X, you get Y.

> A diff between before_NEWVERSION and after_NEWVERSION results in the
> parts I wanted merged.

But, let me guess, the differences are reversed.

> I have obviously done something wrong, but I am not sure of what.
> I tried to follow both CvsBook and Cederqvist.
> I guess I can create a diff and merge it into the current head.
> Is this the right way to go ?

It sounds as if you should undo the merge and try again. You can
do this, thanks to your before and after tags, which I'm
assuming are both on the trunk:

    cvs update -j after_NEWVERSION -j before_NEWVERSION 
                  # note reversed order

Meta-CVS: solid version control tool with directory structure versioning.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]