Mercurial Mercurial > hg > mercurial-crew-with-dirclash / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-unrelated-pull
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 15 Jul 2005 10:07:55 +0100
changeset 708 e849b4db6c95
parent 579 ffeb2c3a1966
child 749 7e4843b7efd2
permissions -rwxr-xr-x
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-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     1
 
mkdir a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     2
 
cd a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     3
 
hg init
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     4
 
echo 123 > a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     5
 
hg add a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     6
 
hg commit -t "a" -u a -d "0 0"
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     7
 












ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     8


cd ..













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




     9


mkdir b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    10


cd b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    11


hg init 













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    12


echo 321 > b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    13


hg add b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    14


hg commit -t "b" -u b -d "0 0"













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    15














ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    16


hg pull ../a













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    17


hg heads















mercurial-crew-with-dirclash