Mercurial > hg

comparison tests/test-import.out @ 5937:d8878742a924

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test case for hg import --no-commit
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 25 Jan 2008 16:18:49 +0100
parents deb0d3518674
children e7f1be4bf40a
comparison
equal deleted inserted replaced
5936:00dfc810dae4 5937:d8878742a924
29 adding manifests 29 adding manifests
30 adding file changes 30 adding file changes
31 added 1 changesets with 2 changes to 2 files 31 added 1 changesets with 2 changes to 2 files
32 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 32 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
33 applying ../tip.patch 33 applying ../tip.patch
34 % import of plain diff should be ok with --no-commit
35 requesting all changes
36 adding changesets
37 adding manifests
38 adding file changes
39 added 1 changesets with 2 changes to 2 files
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
41 applying ../tip.patch
42 diff -r 80971e65b431 a
43 --- a/a
44 +++ b/a
45 @@ -1,1 +1,2 @@
46 line 1
47 +line 2
34 % hg -R repo import 48 % hg -R repo import
35 requesting all changes 49 requesting all changes
36 adding changesets 50 adding changesets
37 adding manifests 51 adding manifests
38 adding file changes 52 adding file changes