view tests/test-merge5.out @ 572:cb7cd12e00f1

[PATCH 5/5]: cleaning the template parent management in hgweb -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH 5/5]: cleaning the template parent management in hgweb From: Goffredo Baroncelli <kreijack@libero.it> remove the unused function hgweb.parent() manifest hash: cd5a8812bc0ecbefb2e9e007f6e2bad12cd9e485 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxv0BywK+sNU5EO8RAtw8AJ4ttjQzg2ZT+17r054Uaidvn34ruwCgtTDt Gcr7hR1VvMyFC70IWBdXIpE= =oKEL -----END PGP SIGNATURE-----
author mpm@selenic.com
date Sat, 02 Jul 2005 12:45:53 -0800
parents c2b9502a4e96
children d45d1c90032e
line wrap: on
line source

+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ echo This is file b1
+ hg add a b
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b22
+ hg commit '-tcomment #1' -d '0 0' -u user
+ hg update 0
+ rm b
+ hg commit -A '-tcomment #2' -d '0 0' -u user
+ yes k
+ hg update 1
this update spans a branch affecting the following files:
aborting update spanning branches!
(use update -m to perform a branch merge)
+ exit 0