Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-git-import @ 3594:5f08389bcf06
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 31 Oct 2006 13:03:52 +0100 |
parents | 1c9b6f1237e0 |
children | 05c8704a3743 |
comparison
equal
deleted
inserted
replaced
3593:9bfb3c049b2a | 3594:5f08389bcf06 |
---|---|
11 --- /dev/null | 11 --- /dev/null |
12 +++ b/new | 12 +++ b/new |
13 @@ -0,0 +1 @@ | 13 @@ -0,0 +1 @@ |
14 +a | 14 +a |
15 EOF | 15 EOF |
16 | |
17 echo % new empty file | |
18 hg import -mempty - <<EOF | |
19 diff --git a/empty b/empty | |
20 new file mode 100644 | |
21 EOF | |
22 hg locate empty | |
16 | 23 |
17 echo % chmod +x | 24 echo % chmod +x |
18 hg import -msetx - <<EOF | 25 hg import -msetx - <<EOF |
19 diff --git a/new b/new | 26 diff --git a/new b/new |
20 old mode 100644 | 27 old mode 100644 |