##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

[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-----
mpm@selenic.com - - Load All Authors

File last commit:

r401:af4848f8 default
r416:5e9e8b8d default
Show More
test-tag.out
31 lines | 778 B | text/plain | TextLexer
/ tests / test-tag.out
History | Annotation | Raw |Copy content |Copy permalink
+ hg init
+ echo a
+ hg add a
+ hg commit -t test -u test -d '0 0'
+ hg history
changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970
summary: test
+ hg tag -u test -d '0 0' bleah
+ hg history
changeset: 1:863197ef03781c4fc00276d83eb66c4cb9cd91df
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970
summary: Added tag bleah for changeset acb14030fe0a21b60322c440ad2d20cf7685a376
changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
tag: bleah
user: test
date: Thu Jan 1 00:00:00 1970
summary: test
+ echo foo
+ hg tag -u test -d '0 0' bleah2
abort: working copy of .hgtags is changed!
(please commit .hgtags manually)
+ echo failed
failed