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 Vadim Gelfer <vadim.gelfer@gmail.com>
Tue, 14 Mar 2006 21:40:46 -0800
changeset 1951 696230e52e4d
parent 1933 7544700fd931
child 1960 dac4bd67f6c5
permissions -rw-r--r--
add HGRCPATH env var, list of places to look for hgrc files. if set, override default hgrc search path. if empty, only .hg/hgrc of current repo read. for each element, if directory, all entries in directory with end in ".rc" are added to path. else, element is added to path. big thing about this change is that user "~/.hgrc" and system hgrc not longer breaks tests. run-tests makes HGRCPATH empty now.
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
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 579
diff changeset 
     6
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset 
     7
 
added 1 changesets with 1 changes to 1 files (+1 heads)
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     8
 
(run 'hg update' to get a working copy)
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1043
diff changeset 
     9
 
changeset:   1:bdcee5d51fa6
579
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
1933
7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 1043
diff changeset 
    12
 
date:        Mon Jan 12 13:46:40 1970 +0000
579
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
 







1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1043

diff
changeset




    15


changeset:   0:f155ba1aa5ba








579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    16


user:        b








1933






7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.



Thomas Arendsen Hein <thomas@intevation.de>


parents: 
1043

diff
changeset




    17


date:        Mon Jan 12 13:46:40 1970 +0000








579






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