Skip to content

Incorrect knock on older VCS #647

@dtikhonov

Description

@dtikhonov

Chapter 3 contains the following paragraph:

It’s worth pointing out that Git determines the best common ancestor to use for its merge base; this is different than older tools like CVS or Subversion (before version 1.5), where the developer doing the merge had to figure out the best merge base for themselves. This makes merging a heck of a lot easier in Git than in these other systems.

This struck me as incorrect, given that cvs update -j works very well. From cvs(1):

         With one -j option, merge changes from the ancestor revision  to  the
         revision  specified  with  the -j option, into the working directory.
         The ancestor revision is the common ancestor of  the  revision  which
         the  working directory is based on, and the revision specified in the
         -j option.

Subversion likely does something similar.

Am I misunderstanding something about what differentiates Git here?

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions