Mercurial > hg
view tests/test-permissions.out @ 6206:0b6f12495276
fetch: switch the default parent used for a merge
This treats newly pulled changes as authoritative, and local changes as
the "satellite" changes.
The prior default behaviour is still available, via the --switch-parent
option.
| author | Bryan O'Sullivan <bos@serpentine.com> |
|---|---|
| date | Wed, 05 Mar 2008 09:10:45 -0800 |
| parents | 3d1f9dcecdea |
| children | 6f750e76fb46 |
line wrap: on
line source
checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions checking changesets checking manifests crosschecking files in changesets and manifests checking files verify failed checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions commit failed diff -r c1fab96507ef a --- a/a +++ b/a @@ -1,1 +1,1 @@ -foo +barber