PCL-CVS, How To Merge?

PCL-CVS, How To Merge?

[Galen Boyer]

Point is on line saying need-merge.  What is the command to make
this happen?  Whenever I hit `d E' on either a marked or unmarked
line, I get the message:

  `merge' is not applicable to any of the selected files.

-- 
Galen Boyer

Re: PCL-CVS, How To Merge?

[Phillip Lord]

>>>>> "Galen" == Galen Boyer <galenboyer@hotpop.com> writes:

  Galen> Point is on line saying need-merge.  What is the command to
  Galen> make this happen?  Whenever I hit `d E' on either a marked or
  Galen> unmarked line, I get the message:

  Galen>   `merge' is not applicable to any of the selected files.

  Galen> -- Galen Boyer


You use "update", which is somewhat confusingly bound to "O". This
will result either in "merge" changing to "modified"; that is the
changes in the repository have been added to your version without
problems, or "conflict" which means CVS can't work it out, in which
case you use `vc-resolve-conflicts' on the buffer, which gives you
ediff, and lots of colours.

Phil

Re: PCL-CVS, How To Merge?

[Stefan Monnier]

Galen> Point is on line saying need-merge.  What is the command to
Galen> make this happen?  Whenever I hit `d E' on either a marked or
Galen> unmarked line, I get the message:
Galen> `merge' is not applicable to any of the selected files.

In its constant efforts to keep things confusing, PCL-CVS uses
`merge' in two different ways:
- bring in pending changes from the repository.
- resolve conflicts.
`imerge' (bound to `d E') should really be called "resolve".

> You use "update", which is somewhat confusingly bound to "O". This

It's done this way to check whether people are attentive.  If after
seeing that the obvious `u' doesn't work they try `U', PCL-CVS
immediately punishes them for their lack of respect for the manual
(which badly needs improvement, of course).

> case you use `vc-resolve-conflicts' on the buffer, which gives you
> ediff, and lots of colours.

Note that `vc-resolve-conflicts' will only use the information that's
in the working file (i.e. using the conflict markers) which typically
lacks the ancestor info.  `d E' does a better job, but it does not always
work because CVS does not save the ancestor info anywhere.


        Stefan "PCL-CVS maintainer"

Re: PCL-CVS, How To Merge?

[Galen Boyer]

On 19 Jun 2003, p.lord@russet.org.uk wrote:
>>>>>> "Galen" == Galen Boyer <galenboyer@hotpop.com> writes:
> 
>   Galen> Point is on line saying need-merge.  What is the
>   Galen> command to make this happen?  Whenever I hit `d E' on
>   Galen> either a marked or unmarked line, I get the message:
> 
>   Galen>   `merge' is not applicable to any of the selected
>   Galen>   files.
> 
>   Galen> -- Galen Boyer
> 
> 
> You use "update", which is somewhat confusingly bound to
> "O". This will result either in "merge" changing to "modified";
> that is the changes in the repository have been added to your
> version without problems, or "conflict" which means CVS can't
> work it out, in which case you use `vc-resolve-conflicts' on
> the buffer, which gives you ediff, and lots of colours.

Okay, I'll give that a try.

For the record (as most already know) PCL-CVS is a wonderful
package.  I am able to constantly have a very informative
conversation with CVS.

-- 
Galen Boyer