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>
Mon, 08 May 2006 10:59:58 -0700
changeset 2221 05b6c13f43c6
parent 2019 ced2d3620f95
child 3621 8c4fd0de5de8
permissions -rw-r--r--
reverse sense of return value from python hooks. old scheme (False/None/0/'' == fail) made coding style unnatural, did not allow use of mercurial commands as hooks. new scheme (False/None/0 == pass) is pythonic, does not require peculiar "return True" at ends of hooks, allows hooks like this: [hooks] # update working dir after push into this repo changegroup.update = python:mercurial.commands.update
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
1960
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset 
     3
 
abort: repository is unrelated
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset 
     4
 
pulling from ../a
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset 
     5
 
searching for changes
dac4bd67f6c5 update test for unrelated repo.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1933
diff changeset 
     6
 
warning: repository is unrelated
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     7
 
adding changesets
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
     8
 
adding manifests
775
122449dd89db Fix up test results
mpm@selenic.com
parents: 579
diff changeset 
     9
 
adding file changes
1043
9344f5dd4488 Update tests
mpm@selenic.com
parents: 981
diff changeset 
    10
 
added 1 changesets with 1 changes to 1 files (+1 heads)
2019
ced2d3620f95 add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents: 1960
diff changeset 
    11
 
(run 'hg heads' to see heads, 'hg merge' to merge)
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
 
changeset:   1:bdcee5d51fa6
579
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    13
 
tag:         tip
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    14
 
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 
    15
 
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 
    16
 
summary:     a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff changeset 
    17
 







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




    18


changeset:   0:f155ba1aa5ba








579






ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    19


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




    20


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




    21


summary:     b













ffeb2c3a1966
Actually warn on pulling from an unrelated repository



mpm@selenic.com


parents: 

diff
changeset




    22
















mercurial-crew-with-dirclash