##// END OF EJS Templates
[PATCH] Removal of a file added by merging branches...
[PATCH] Removal of a file added by merging branches -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----

File last commit:

r401:af4848f8 default
r416:5e9e8b8d default
Show More
test-help.out
84 lines | 3.6 KiB | text/plain | TextLexer
mpm@selenic.com
Add a simple testing framework...
r331 + hg help
hg commands:
add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
cat output the latest or given revision of a file
commit commit the specified files or all outstanding changes
mpm@selenic.com
test-help: hg copy now shows up in the help...
r364 copy mark a file as copied or renamed for the next commit
mpm@selenic.com
Add a simple testing framework...
r331 diff diff working directory (or selected files)
export dump the changeset header and diffs for a revision
forget don't add the specified files on the next commit
heads show current repository heads
help show help for a given command or all commands
history show the changelog history
mpm@selenic.com
update help test for identify...
r342 identify print information about the working copy
mpm@selenic.com
Add a simple testing framework...
r331 init create a new repository or copy an existing one
log show the revision history of a single file
manifest output the latest or given revision of the project manifest
parents show the parents of the current working dir
patch import an ordered set of patches
pull pull changes from the specified source
push push changes to the specified destination
rawcommit raw commit interface
recover roll back an interrupted transaction
remove remove the specified files on the next commit
serve export the repository via HTTP
status show changed files in the working directory
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 tag add a tag for the current tip or a given revision
mpm@selenic.com
Add a simple testing framework...
r331 tags list repository tags
tip show the tip revision
undo undo the last transaction
update update or merge working directory
verify verify the integrity of the repository
+ hg add -h
hg add: option -h not recognized
hg add [files]
add the specified files on the next commit
+ hg help diff
hg diff [-r A] [-r B] [files]
-r --rev
revision
diff working directory (or selected files)
+ hg help foo
hg: unknown command foo
mpm@selenic.com
Add some more tests...
r336 + hg commands
hg: unknown command 'commands'
hg commands:
add add the specified files on the next commit
addremove add all new files, delete all missing files
annotate show changeset information per file line
cat output the latest or given revision of a file
commit commit the specified files or all outstanding changes
mpm@selenic.com
test-help: hg copy now shows up in the help...
r364 copy mark a file as copied or renamed for the next commit
mpm@selenic.com
Add some more tests...
r336 diff diff working directory (or selected files)
export dump the changeset header and diffs for a revision
forget don't add the specified files on the next commit
heads show current repository heads
help show help for a given command or all commands
history show the changelog history
mpm@selenic.com
update help test for identify...
r342 identify print information about the working copy
mpm@selenic.com
Add some more tests...
r336 init create a new repository or copy an existing one
log show the revision history of a single file
manifest output the latest or given revision of the project manifest
parents show the parents of the current working dir
patch import an ordered set of patches
pull pull changes from the specified source
push push changes to the specified destination
rawcommit raw commit interface
recover roll back an interrupted transaction
remove remove the specified files on the next commit
serve export the repository via HTTP
status show changed files in the working directory
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 tag add a tag for the current tip or a given revision
mpm@selenic.com
Add some more tests...
r336 tags list repository tags
tip show the tip revision
undo undo the last transaction
update update or merge working directory
verify verify the integrity of the repository
+ exit 0