Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge6.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 | 32f7dc81c07e |
children | 7e4843b7efd2 |
line wrap: on
line source
+ cat + chmod +x merge + export HGMERGE=./merge + HGMERGE=./merge + mkdir A1 + cd A1 + hg init + echo This is file foo1 + echo This is file bar1 + hg add foo bar + hg commit -t 'commit text' -d '0 0' -u user + cd .. + hg clone A1 B1 + cd A1 + rm bar + hg remove bar + hg commit -t 'commit test' -d '0 0' -u user + cd ../B1 + echo This is file foo22 + hg commit -t 'commit test' -d '0 0' -u user + cd .. + hg clone A1 A2 + hg clone B1 B2 + cd A1 + hg pull ../B1 pulling from ../B1 searching for changes adding changesets adding manifests adding file revisions modified 1 files, added 1 changesets and 1 new revisions (run 'hg update' to get a working copy) + hg update -m + hg commit -t 'commit test' -d '0 0' -u user + echo bar should remain deleted. bar should remain deleted. + hg manifest 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo + cd ../B2 + hg pull ../A2 pulling from ../A2 searching for changes adding changesets adding manifests adding file revisions modified 0 files, added 1 changesets and 0 new revisions (run 'hg update' to get a working copy) + hg update -m + hg commit -t 'commit test' -d '0 0' -u user + echo bar should remain deleted. bar should remain deleted. + hg manifest 6b70e9e451a5a33faad7bbebe627e46b937b7364 644 foo