Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge5.out @ 708:e849b4db6c95
Use changelogentry.tmpl for search results, too.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use changelogentry.tmpl for search results, too.
Since both are lists of changelog entries, they don't need to look different.
This fixes a bug where only changelogentry was updated, but searchentry not.
manifest hash: 9bfe7a3dd4512d3ee4e5538f369371bce6d55520
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC13zrW7P1GVgWeRoRAghNAJ9Agd+uPQ2iGdHAnjebr2R/RzAzUACdEyWq
+yKY7wp16TD72ls6Q49LHJg=
=9aSM
-----END PGP SIGNATURE-----
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 15 Jul 2005 10:07:55 +0100 |
parents | d45d1c90032e |
children | 7e4843b7efd2 |
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: b aborting update spanning branches! (use update -m to perform a branch merge) + exit 0