diff options
| author | Lorry Tar Creator <lorry-tar-importer@baserock.org> | 2011-10-01 20:49:36 +0000 |
|---|---|---|
| committer | Lorry <lorry@roadtrain.codethink.co.uk> | 2012-09-27 13:27:51 +0000 |
| commit | 921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch) | |
| tree | 3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-diff-color.t | |
| parent | 9039c805b0a7e36220101323f82735f08a104b37 (diff) | |
| download | mercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz | |
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-diff-color.t')
| -rw-r--r-- | tests/test-diff-color.t | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/tests/test-diff-color.t b/tests/test-diff-color.t index fe898d9..94387ac 100644 --- a/tests/test-diff-color.t +++ b/tests/test-diff-color.t @@ -72,11 +72,9 @@ diffstat $ echo "[diff]" >> $HGRCPATH $ echo "git=True" >> $HGRCPATH -#if execbit - record - $ chmod +x a + $ chmod 0755 a $ hg record --color=always -m moda a <<EOF > y > y @@ -85,7 +83,7 @@ record \x1b[0;36;1mold mode 100644\x1b[0m (esc) \x1b[0;36;1mnew mode 100755\x1b[0m (esc) 1 hunks, 1 lines changed - \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m (esc) + \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) c a @@ -95,8 +93,9 @@ record a a c - \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) - + \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) + $ echo + $ echo "[extensions]" >> $HGRCPATH $ echo "mq=" >> $HGRCPATH $ hg rollback @@ -113,7 +112,7 @@ qrecord \x1b[0;36;1mold mode 100644\x1b[0m (esc) \x1b[0;36;1mnew mode 100755\x1b[0m (esc) 1 hunks, 1 lines changed - \x1b[0;33mexamine changes to 'a'? [Ynesfdaq?]\x1b[0m (esc) + \x1b[0;33mexamine changes to 'a'? [Ynsfdaq?]\x1b[0m (esc) \x1b[0;35m@@ -2,7 +2,7 @@\x1b[0m (esc) c a @@ -123,8 +122,6 @@ qrecord a a c - \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) - -#endif - - $ cd .. + \x1b[0;33mrecord this change to 'a'? [Ynsfdaq?]\x1b[0m (esc) + $ echo + |