[Top][All Lists]

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

Re: Merge errors from HEAD to branch

From: Christian Robottom Reis
Subject: Re: Merge errors from HEAD to branch
Date: Wed, 24 Mar 2004 11:16:22 -0300
User-agent: Mutt/1.3.28i

On Tue, Mar 16, 2004 at 11:08:27AM -0500, Jim.Hyslop wrote:
> > Now let's say I want to merge in the referred changes. The 
> > way I see it
> > (as per book and info reading) is:
> > 
> >     cvs up -j HEAD:"2 days ago" -j HEAD ChangeLog 
> HEAD has a specific meaning - it means "the latest revision on the trunk
> [footnote]". Because you have specified an exact revision, the date
> component will be ignored (the date component can only be used with a
> _branch_ tag), so your command boils down to:
>   cvs up -j HEAD -j HEAD
> which tells CVS "Take the difference between revision 'HEAD' and revision
> 'HEAD', and apply that difference to my local file." Since the two revisions
> are identical, there is no difference and nothing to apply.
> If this is the first time you are merging (which I strongly suspect, given
> your question), then CVS will use the ancestor revision (in the specific

Hmm. My situation was a bit peculiar: I wanted to merge in *only* the
changes that were done in the last 2 days, ignoring changes done before
that (which is why I specified the date modifier to HEAD); I still don't
see how I can do that easily (without specifying tags to delimit the

Perhaps CVS doesn't allow you to merge arbitrary timeslices of your tree
without having specific tags to merge against; perhaps it's silly anyway
to assume it would let you merge only a subset of the changes done to
HEAD since the branch (given the chance that you're going to mess up is
large since you're not respecting the historical evolution of the tree).

I ended up just generating a diff of everything changes in the past two
days and merging it in manually, but I would love to know if there's a
"more correct" solution.

Take care,
Christian Robottom Reis | | [+55 16] 261 2331

reply via email to

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