##// 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:

r404:a1ecef49 default
r416:5e9e8b8d default
Show More
test-simple-update.out
40 lines | 796 B | text/plain | TextLexer
/ tests / test-simple-update.out
mpm@selenic.com
Add a simple testing framework...
r331 + mkdir test
+ cd test
+ echo foo
+ hg init
+ hg addremove
+ hg commit -t 1
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
+ cd ..
+ mkdir branch
+ cd branch
+ hg init ../test
+ hg co
+ echo bar
+ hg commit -t 2
+ cd ../test
+ hg pull ../branch
mpm@selenic.com
[PATCH] Unintuive use...
r404 pulling from ../branch
mpm@selenic.com
Add a simple testing framework...
r331 searching for changes
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
mpm@selenic.com
[PATCH] Unintuive use...
r404 (run 'hg update' to get a working copy)
mpm@selenic.com
Add a simple testing framework...
r331 + hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 2 changesets, 2 total revisions
+ hg co
+ cat foo
foo
bar
+ hg manifest
6f4310b00b9a147241b071a60c28a650827fb03d 644 foo