equal
deleted
inserted
replaced
26 |
26 |
27 $ hg clone . ../zoz |
27 $ hg clone . ../zoz |
28 updating to branch default |
28 updating to branch default |
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
29 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
30 $ cp .hg/hgrc ../zoz/.hg |
30 $ cp .hg/hgrc ../zoz/.hg |
31 $ $PYTHON unix2dos.py f |
31 $ "$PYTHON" unix2dos.py f |
32 |
32 |
33 commit should fail |
33 commit should fail |
34 |
34 |
35 $ hg ci -m 2.1 |
35 $ hg ci -m 2.1 |
36 attempt to commit or push text file(s) using CRLF line endings |
36 attempt to commit or push text file(s) using CRLF line endings |
100 |
100 |
101 and now for something completely different |
101 and now for something completely different |
102 |
102 |
103 $ mkdir d |
103 $ mkdir d |
104 $ echo hello > d/f2 |
104 $ echo hello > d/f2 |
105 $ $PYTHON unix2dos.py d/f2 |
105 $ "$PYTHON" unix2dos.py d/f2 |
106 $ hg add d/f2 |
106 $ hg add d/f2 |
107 $ hg ci -m 3 |
107 $ hg ci -m 3 |
108 attempt to commit or push text file(s) using CRLF line endings |
108 attempt to commit or push text file(s) using CRLF line endings |
109 in 053ba1a3035a: d/f2 |
109 in 053ba1a3035a: d/f2 |
110 transaction abort! |
110 transaction abort! |
116 $ rm d/f2 |
116 $ rm d/f2 |
117 |
117 |
118 $ hg rem f |
118 $ hg rem f |
119 $ hg ci -m 4 |
119 $ hg ci -m 4 |
120 |
120 |
121 $ $PYTHON -c 'open("bin", "wb").write(b"hello\x00\x0D\x0A")' |
121 $ "$PYTHON" -c 'open("bin", "wb").write(b"hello\x00\x0D\x0A")' |
122 $ hg add bin |
122 $ hg add bin |
123 $ hg ci -m 5 |
123 $ hg ci -m 5 |
124 $ hg log -v |
124 $ hg log -v |
125 changeset: 5:f0b1c8d75fce |
125 changeset: 5:f0b1c8d75fce |
126 tag: tip |
126 tag: tip |
179 $ hg -R dupe add |
179 $ hg -R dupe add |
180 adding dupe/a |
180 adding dupe/a |
181 adding dupe/b |
181 adding dupe/b |
182 adding dupe/c |
182 adding dupe/c |
183 adding dupe/d |
183 adding dupe/d |
184 $ $PYTHON unix2dos.py dupe/b dupe/c dupe/d |
184 $ "$PYTHON" unix2dos.py dupe/b dupe/c dupe/d |
185 $ hg -R dupe ci -m a dupe/a |
185 $ hg -R dupe ci -m a dupe/a |
186 $ hg -R dupe ci -m b/c dupe/[bc] |
186 $ hg -R dupe ci -m b/c dupe/[bc] |
187 $ hg -R dupe ci -m d dupe/d |
187 $ hg -R dupe ci -m d dupe/d |
188 $ hg -R dupe log -v |
188 $ hg -R dupe log -v |
189 changeset: 8:67ac5962ab43 |
189 changeset: 8:67ac5962ab43 |
340 1 |
340 1 |
341 |
341 |
342 |
342 |
343 $ rm .hg/hgrc |
343 $ rm .hg/hgrc |
344 $ (echo some; echo text) > f3 |
344 $ (echo some; echo text) > f3 |
345 $ $PYTHON -c 'open("f4.bat", "wb").write(b"rem empty\x0D\x0A")' |
345 $ "$PYTHON" -c 'open("f4.bat", "wb").write(b"rem empty\x0D\x0A")' |
346 $ hg add f3 f4.bat |
346 $ hg add f3 f4.bat |
347 $ hg ci -m 6 |
347 $ hg ci -m 6 |
348 $ cat bin |
348 $ cat bin |
349 hello\x00\r (esc) |
349 hello\x00\r (esc) |
350 $ cat f3 |
350 $ cat f3 |
393 some\r (esc) |
393 some\r (esc) |
394 text\r (esc) |
394 text\r (esc) |
395 $ cat f4.bat |
395 $ cat f4.bat |
396 rem empty\r (esc) |
396 rem empty\r (esc) |
397 |
397 |
398 $ $PYTHON -c 'open("f5.sh", "wb").write(b"# empty\x0D\x0A")' |
398 $ "$PYTHON" -c 'open("f5.sh", "wb").write(b"# empty\x0D\x0A")' |
399 $ hg add f5.sh |
399 $ hg add f5.sh |
400 $ hg ci -m 7 |
400 $ hg ci -m 7 |
401 $ cat f5.sh |
401 $ cat f5.sh |
402 # empty\r (esc) |
402 # empty\r (esc) |
403 $ hg cat f5.sh |
403 $ hg cat f5.sh |