Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-nested-repo @ 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 | 890e285c52a1 |
children | d316124ebbea |
line wrap: on
line source
#!/bin/sh hg init a cd a hg init b echo x > b/x echo '# should print nothing' hg st echo '# should print ? b/x' hg st b/x hg add b/x echo '# should print A b/x' hg st echo '# should forget b/x' hg revert --all echo '# should print nothing' hg st b