equal
deleted
inserted
replaced
44 Prepare source repo and patch: |
44 Prepare source repo and patch: |
45 |
45 |
46 $ rm $HGRCPATH |
46 $ rm $HGRCPATH |
47 $ hg init c |
47 $ hg init c |
48 $ cd c |
48 $ cd c |
49 $ echo 0 > a |
49 $ printf "a\rc" > a |
50 $ hg ci -A -m 0 a -d '0 0' |
50 $ hg ci -A -m 0 a -d '0 0' |
51 $ echo 1 >> a |
51 $ printf "a\rb\rc" > a |
52 $ cat << eof > log |
52 $ cat << eof > log |
53 > first line which can't start with '# ' |
53 > first line which can't start with '# ' |
54 > # second line is a comment but that shouldn't be a problem. |
54 > # second line is a comment but that shouldn't be a problem. |
55 > A patch marker like this was more problematic even after d7452292f9d3: |
55 > A patch marker like this was more problematic even after d7452292f9d3: |
56 > # HG changeset patch |
56 > # HG changeset patch |
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
72 $ cd d |
72 $ cd d |
73 $ hg import ../c/p |
73 $ hg import ../c/p |
74 applying ../c/p |
74 applying ../c/p |
75 $ hg log -v -r 1 |
75 $ hg log -v -r 1 |
76 changeset: 1:e8cc66fbbaa6 |
76 changeset: 1:cd0bde79c428 |
77 tag: tip |
77 tag: tip |
78 user: test |
78 user: test |
79 date: Thu Jan 01 00:00:00 1970 +0000 |
79 date: Thu Jan 01 00:00:00 1970 +0000 |
80 files: a |
80 files: a |
81 description: |
81 description: |