Mercurial > hg
view tests/test-merge-types.t @ 14327:d943412e2fba
extdiff: grammar "allows to" -> "allows one to"
The verb to allow requires a direct object.
Lintian, a Debian tool to find common mistakes, reported it. I'm not a
native english speaker but I think this is correct.
author | Javi Merino <cibervicho@gmail.com> |
---|---|
date | Sun, 15 May 2011 18:00:22 +0100 |
parents | 28e2e3804f2e |
children | e0348815e806 |
line wrap: on
line source
$ hg init $ echo a > a $ hg ci -Amadd adding a $ chmod +x a $ hg ci -mexecutable $ hg up 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ rm a $ ln -s symlink a $ hg ci -msymlink created new head $ hg merge --debug searching for copies back to rev 1 resolving manifests overwrite None partial False ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: update permissions -> e updating: a 1/1 files (100.00%) 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Symlink is local parent, executable is other: $ if [ -h a ]; then > echo a is a symlink > $TESTDIR/readlink.py a > elif [ -x a ]; then > echo a is executable > else > echo "a has no flags (default for conflicts)" > fi a has no flags (default for conflicts) $ hg update -C 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg merge --debug searching for copies back to rev 1 resolving manifests overwrite None partial False ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f conflicting flags for a (n)one, e(x)ec or sym(l)ink? n a: remote is newer -> g updating: a 1/1 files (100.00%) getting a 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) Symlink is other parent, executable is local: $ if [ -h a ]; then > echo a is a symlink > $TESTDIR/readlink.py a > elif [ -x a ]; then > echo a is executable > else > echo "a has no flags (default for conflicts)" > fi a has no flags (default for conflicts)