Mercurial > hg
diff tests/test-subrepo.out @ 11683:757f39fa1162
dispatch: write Abort hint to stderr too
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Mon, 26 Jul 2010 22:28:37 +0200 |
| parents | b602a95c21ec |
| children | a286a4ecbfeb |
line wrap: on
line diff
--- a/tests/test-subrepo.out Mon Jul 26 22:26:12 2010 +0200 +++ b/tests/test-subrepo.out Mon Jul 26 22:28:37 2010 +0200 @@ -183,13 +183,13 @@ % push -f committing subrepository s abort: push creates new remote heads on branch 'default'! +(did you forget to merge? use push -f to force) pushing ...sub/t pushing ...sub/t/s/ss searching for changes no changes found pushing ...sub/t/s searching for changes -(did you forget to merge? use push -f to force) pushing ...sub/t pushing ...sub/t/s/ss searching for changes @@ -300,4 +300,5 @@ created new head committing subrepository s abort: push creates new remote heads on branch 'default'! +(did you forget to merge? use push -f to force) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved