Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-issue352 @ 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 | b90e323a4781 |
children | 2184378b20b5 |
line wrap: on
line source
#!/bin/sh # http://www.selenic.com/mercurial/bts/issue352 hg init foo cd foo A=`printf 'he\rllo'` echo foo > "$A" hg add hg ci -A -m m rm "$A" echo foo > "hell o" hg add hg ci -A -m m echo foo > "$A" hg debugwalk exit 0