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.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 15 Jul 2005 10:07:55 +0100
changeset 708 e849b4db6c95
parent 579 ffeb2c3a1966
child 775 122449dd89db
child 793 445970ccf57a
permissions -rw-r--r--
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
 
pulling from ../a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     2
 
searching for changes
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     3
 
warning: pulling from an unrelated repository!
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     4
 
adding changesets
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     5
 
adding manifests
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     6
 
adding file revisions
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     7
 
modified 1 files, added 1 changesets and 1 new revisions
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     8
 
(run 'hg update' to get a working copy)
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     9
 
changeset:   1:9a79c33a9db37480e40fbd2a65d62ebd2a3c441c
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    10
 
tag:         tip
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    11
 
user:        a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    12
 
date:        Thu Jan  1 00:00:00 1970
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    13
 
summary:     a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    14
 












ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    15


changeset:   0:01f8062b2de51c0fa6428c5db1d1b3ea780189df













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    16


user:        b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    17


date:        Thu Jan  1 00:00:00 1970













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    18


summary:     b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    19
















mercurial-crew-with-dirclash