tests/test-empty-file.out
author Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
Tue, 18 Dec 2007 14:11:13 -0600
changeset 5664 da72b4d24797
parent 5405 8feb33c2d153
child 6336 4b0c9c674707
permissions -rw-r--r--
Fix income/pull with bundle and -R (issue 820). Uses ui.setconfig() to tell bundlerepo where the main repo is. This is needed for when the --repository option is used. Adds tests to test-bundle and a new test script test-mq-pull-from-bundle, which plays out the situation that initially made me detect this bug (hg -R .hg/patches pull ../bundle.hg).

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
changeset:   2:62ec0e86d1e5
tag:         tip
parent:      0:567dde5e6e98
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add empty3

changeset:   1:41ab7b321727
user:        test
date:        Mon Jan 12 13:46:40 1970 +0000
summary:     add empty2

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
M empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty1
b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty2
b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty3