Differences between revisions 27 and 28
Revision 27 as of 2011-02-06 23:16:04
Size: 3687
Editor: PaulBoddie
Comment: Put the closest equivalent to "cvs update" in the Mercurial column, noting what it does in the meaning column.
Revision 28 as of 2012-11-06 13:41:59
Size: 3679
Editor: abuehl
Comment: use Cmd: prefix for links to commands
Deletions are marked like this. Additions are marked like this.
Line 6: Line 6:
|| add || add         || add a new file to the [[Repository|repository]] || || || add || [[Cmd:add]] || add a new file to the [[Repository|repository]] || ||
Line 8: Line 8:
|| annotate || annotate || show modification info for each line in a file || ||
|| checkout || [[Clone|clone]] ([[Update|update]]) || create a [[WorkingDirectory|working directory]] from a repository (use [[Update|update]] to change an existing [[WorkingDirectory|working directory]]) || ||
|| commit || [[Commit|commit]] ([[Push|push]])   || commit outstanding changes to a new [[ChangeSet|changeset]] (use [[Push|push]] to send commits to remote repository) || ||
|| diff || [[Diff|diff]] || diff [[Re
vision|revisions]], or compare the [[Tip|tip]] to the [[WorkingDirectory|working directory]] || ||
|| export || archive
|| produce an unversioned snapshot of a repository - Mercurial [[Export|export]] is a ''different'' operation || ||
|| annotate || [[Cmd:annotate]]|| show modification info for each line in a file || ||
|| checkout || [[Cmd:clone]] ([[Cmd:Update]]) || create a [[WorkingDirectory|working directory]] from a repository (use [[Update|update]] to change an existing [[WorkingDirectory|working directory]]) || ||
|| commit || [[Cmd:commit]] ([[Cmd:push]]) || commit outstanding changes to a new [[ChangeSet|changeset]] (use [[Push|push]] to send commits to remote repository) || ||
|| diff || [[Cmd:diff]] || diff [[Revision|revisions]], or compare the [[Tip|tip]] to the [[WorkingDirectory|
working directory]] || ||
|| export ||
[[Cmd:archive]] || produce an unversioned snapshot of a repository - Mercurial [[Export|export]] is a ''different'' operation || ||
Line 14: Line 14:
|| import || addremove       || use addremove and [[Commit|commit]] to import source trees, Mercurial's [[Import|import]] only imports patches || || || import || [[Cmd:addremove]] || use addremove and [[Commit|commit]] to import source trees, Mercurial's [[Import|import]] only imports patches || ||
Line 16: Line 16:
|| kserver || [[Serve|serve]] || export [[Repository|repository]] remotely || [[CvsConcepts#server|Running a server]] (for CVS) and [[PublishingRepositories|Publishing Repositories]] ||
|| log || log || show [[Revision|revision]] history of [[Repository|repository]] or file || ||
|| kserver || [[Cmd:serve]] || export [[Repository|repository]] remotely || [[CvsConcepts#server|Running a server]] (for CVS) and [[PublishingRepositories|Publishing Repositories]] ||
|| log || [[Cmd:log]] || show [[Revision|revision]] history of [[Repository|repository]] or file || ||
Line 20: Line 20:
|| pserver || [[Serve|serve]] || export [[Repository|repository]] remotely || [[CvsConcepts#server|Running a server]] (for CVS) and [[PublishingRepositories|Publishing Repositories]] || || pserver || [[Cmd:serve]] || export [[Repository|repository]] remotely || [[CvsConcepts#server|Running a server]] (for CVS) and [[PublishingRepositories|Publishing Repositories]] ||
Line 22: Line 22:
|| rdiff || [[Export|export]] || export [[ChangeSet|changeset]] in [[PatchFile|patch file]] format || || || rdiff || [[Cmd:export]]  || export [[ChangeSet|changeset]] in [[PatchFile|patch file]] format || ||
Line 24: Line 24:
|| remove || remove         || remove the specified files on the next [[Commit|commit]] || || || remove || [[Cmd:remove]] || remove the specified files on the next [[Commit|commit]] || ||
Line 26: Line 26:
|| rtag || [[Tag|tag]] || add a tag for a [[ChangeSet|changeset]] || ||
|| server || [[Serve|serve]] || export [[Repository|repository]] remotely || [[CvsConcepts#server|Running a server]] (for CVS) and [[PublishingRepositories|Publishing Repositories]] ||
|| status || status         || show changed files in [[WorkingDirectory|working directory]] || ||
|| tag || [[Tag|tag]] || add a tag for a [[ChangeSet|changeset]] || [[CvsConcepts#tag|Modules, branching and tagging]] (for CVS) ||
|| rtag || [[Cmd:tag]] || add a tag for a [[ChangeSet|changeset]] || ||
|| server || [[Cmd:serve]] || export [[Repository|repository]] remotely || [[CvsConcepts#server|Running a server]] (for CVS) and [[PublishingRepositories|Publishing Repositories]] ||
|| status || [[Cmd:status]] || show changed files in [[WorkingDirectory|working directory]] || ||
|| tag || [[Cmd:tag]] || add a tag for a [[ChangeSet|changeset]] || [[CvsConcepts#tag|Modules, branching and tagging]] (for CVS) ||
Line 31: Line 31:
|| update || pull -u         || update or merge [[WorkingDirectory|working directory]], mostly equivalent to a combination of [[Pull|pull]] (to get remote changes) and [[Update|update]] in Mercurial || || || update || [[Cmd:pull|pull -u]] || update or merge [[WorkingDirectory|working directory]], mostly equivalent to a combination of [[Cmd:pull]] (to get remote changes) and [[Update|update]] in Mercurial || ||

Mercurial equivalents of CVS commands

This table lists Mercurial's equivalents for commands provided by CVS. Many CVS commands that do not have direct equivalents in Mercurial are discussed in CvsConcepts.

CVS

Mercurial

Meaning

References

add

add

add a new file to the repository

admin

annotate

annotate

show modification info for each line in a file

checkout

clone (Update)

create a working directory from a repository (use update to change an existing working directory)

commit

commit (push)

commit outstanding changes to a new changeset (use push to send commits to remote repository)

diff

diff

diff revisions, or compare the tip to the working directory

export

archive

produce an unversioned snapshot of a repository - Mercurial export is a different operation

history

import

addremove

use addremove and commit to import source trees, Mercurial's import only imports patches

init

CVS's init really only initialises its repository system for use, whereas Mercurial's init creates a new ready-to-use repository from scratch

kserver

serve

export repository remotely

Running a server (for CVS) and Publishing Repositories

log

log

show revision history of repository or file

login

Authenticated access (for CVS)

logout

Authenticated access (for CVS)

pserver

serve

export repository remotely

Running a server (for CVS) and Publishing Repositories

rannotate

rdiff

export

export changeset in patch file format

release

remove

remove

remove the specified files on the next commit

rlog

rtag

tag

add a tag for a changeset

server

serve

export repository remotely

Running a server (for CVS) and Publishing Repositories

status

status

show changed files in working directory

tag

tag

add a tag for a changeset

Modules, branching and tagging (for CVS)

unedit

update

pull -u

update or merge working directory, mostly equivalent to a combination of pull (to get remote changes) and update in Mercurial

version

version

print version and copyright information

watch

Watching files (for CVS)

watchers

Watching files (for CVS)

CvsCommands (last edited 2012-11-06 13:50:26 by abuehl)