mercurial/crew at 12284: 2 outgoing changesets (1 stable)

Thomas Arendsen Hein thomas at intevation.de
Fri Sep 17 08:32:18 CDT 2010


* Mercurial Commits <hg at intevation.org> [20100916 13:00]:
> http://hg.intevation.org/mercurial/crew/rev/0852da25a31b
> changeset:   12283:0852da25a31b
> branch:      stable
> parent:      12277:a7d3147bd4b3
> user:        Steve Borho <steve at borho.org>
> date:        Wed Sep 15 17:46:51 2010 -0500
> summary:     eol: setup the repo.ui in reposetup()

This causes test-eol-update to fail:

--- /home/thomas/hg/repos/tah/tests/test-eol-update.out 
+++ /home/thomas/hg/repos/tah/tests/test-eol-update.err 
@@ -25,8 +25,8 @@
 merging a.txt
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 % printrepr.py a.txt
-first\r
-third\r
+first
+third
 % hg diff
 diff --git a/a.txt b/a.txt
 --- a/a.txt
@@ -57,8 +57,8 @@
 merging a.txt
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 % printrepr.py a.txt
-first\r
-third\r
+first
+third
 % hg diff
 diff --git a/a.txt b/a.txt
 --- a/a.txt


Regards,
Thomas

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Neuer Graben 17, 49074 Osnabrueck - AG Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner


More information about the Mercurial-devel mailing list