Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-simple-update.out @ 4510:e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Rationale for not aborting instead:
The first parent is usually more important as it is the local branch
during a merge and commands like 'hg diff' and 'hg diff -r.' behave still
identically (except for the warning of course).
Added a test for log -r. with one and two parents.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 06 Jun 2007 19:05:18 +0200 |
| parents | 9d1c3529ebbc |
| children | 8feb33c2d153 |
line wrap: on
line source
adding foo checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../branch searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 2 changesets, 2 total revisions 1 files updated, 0 files merged, 0 files removed, 0 files unresolved foo bar 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo