equal
deleted
inserted
replaced
79 searching for changes |
79 searching for changes |
80 adding changesets |
80 adding changesets |
81 adding manifests |
81 adding manifests |
82 adding file changes |
82 adding file changes |
83 added 2 changesets with 2 changes to 1 files |
83 added 2 changesets with 2 changes to 1 files |
|
84 |
|
85 $ printf "first\r\nsecond" > b.txt |
|
86 $ hg add b.txt |
|
87 $ hg commit -m 'CRLF b.txt' |
|
88 $ hg push ../main |
|
89 pushing to ../main |
|
90 searching for changes |
|
91 adding changesets |
|
92 adding manifests |
|
93 adding file changes |
|
94 added 1 changesets with 1 changes to 1 files |
|
95 error: pretxnchangegroup hook failed: b.txt should not have CRLF line endings |
|
96 transaction abort! |
|
97 rollback completed |
|
98 abort: b.txt should not have CRLF line endings |
|
99 [255] |
|
100 |
|
101 $ hg up -r -2 |
|
102 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
103 $ printf "some\nother\nfile" > c.txt |
|
104 $ hg add c.txt |
|
105 $ hg commit -m "LF c.txt, b.txt doesn't exist here" |
|
106 created new head |
|
107 $ hg push -f ../main |
|
108 pushing to ../main |
|
109 searching for changes |
|
110 adding changesets |
|
111 adding manifests |
|
112 adding file changes |
|
113 added 2 changesets with 2 changes to 2 files (+1 heads) |
|
114 error: pretxnchangegroup hook failed: b.txt should not have CRLF line endings |
|
115 transaction abort! |
|
116 rollback completed |
|
117 abort: b.txt should not have CRLF line endings |
|
118 [255] |