Mercurial > hg-stable

view tests/test-merge4.out @ 570:2ee819a950aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH 2/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 2/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> hgweb: rename #parent1# and #parent2# to #parent# in the template managment manifest hash: c7da29f029a1c875127989bb6635007a90f8f59c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxvmkywK+sNU5EO8RAnREAKCXuVAU054xkYsfQLug3y/u4tpGxQCfdnKA QkX42FSUBN1EwFyzrzC6vs0= =o8VK -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 12:31:32 -0800
parents 5e9e8b8d2629
children 7e4843b7efd2
line wrap: on
line source

+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update -m 1
+ rm b
+ echo This is file c22
+ hg commit -t 'commit #3' -d '0 0' -u user