Mercurial > hg
comparison tests/test-win32text.out @ 9611:a3d73b3e1f8a
hg.clone: report branch name on update
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Fri, 16 Oct 2009 23:57:34 +0200 |
parents | f584d63c49c3 |
children | ebf69364e80f |
comparison
equal
deleted
inserted
replaced
9610:d78fe60f6bda | 9611:a3d73b3e1f8a |
---|---|
2 pretxncommit.crlf = python:hgext.win32text.forbidcrlf | 2 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
3 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf | 3 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
4 | 4 |
5 commit should succeed | 5 commit should succeed |
6 | 6 |
7 updating working directory | 7 updating to branch default |
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
9 commit should fail | 9 commit should fail |
10 Attempt to commit or push text file(s) using CRLF line endings | 10 Attempt to commit or push text file(s) using CRLF line endings |
11 in f583ea08d42a: f | 11 in f583ea08d42a: f |
12 transaction abort! | 12 transaction abort! |
111 description: | 111 description: |
112 1 | 112 1 |
113 | 113 |
114 | 114 |
115 | 115 |
116 updating working directory | 116 updating to branch default |
117 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 117 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
118 | 118 |
119 adding dupe/a | 119 adding dupe/a |
120 adding dupe/b | 120 adding dupe/b |
121 adding dupe/c | 121 adding dupe/c |