Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-hup.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 | 73c918c71300 |
children | 30d4d8985dd8 |
rev | line source |
---|---|
642 | 1 0 |
2 0 | |
3 adding changesets | |
4 killed! | |
5 transaction abort! | |
6 rollback completed | |
4275
73c918c71300
changelog: optimize delayed updates for clone vs pull
Matt Mackall <mpm@selenic.com>
parents:
3917
diff
changeset
|
7 .hg/00changelog.i .hg/journal.dirstate .hg/requires .hg/store .hg/store/00changelog.i .hg/store/00changelog.i.a |