Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-merge4.out @ 416:5e9e8b8d2629

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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-----
author mpm@selenic.com
date Tue, 21 Jun 2005 19:19:39 -0800
parents
children 7e4843b7efd2
comparison
equal deleted inserted replaced
415:c2b9502a4e96 416:5e9e8b8d2629
1 + hg init
2 + echo This is file a1
3 + hg add a
4 + hg commit -t 'commit #0' -d '0 0' -u user
5 + echo This is file b1
6 + hg add b
7 + hg commit -t 'commit #1' -d '0 0' -u user
8 + hg update 0
9 + echo This is file c1
10 + hg add c
11 + hg commit -t 'commit #2' -d '0 0' -u user
12 + hg update -m 1
13 + rm b
14 + echo This is file c22
15 + hg commit -t 'commit #3' -d '0 0' -u user