equal
deleted
inserted
replaced
123 a |
123 a |
124 a |
124 a |
125 c |
125 c |
126 \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) |
126 \x1b[0;33mrecord this change to 'a'? [Ynesfdaq?]\x1b[0m (esc) |
127 |
127 |
|
128 $ hg qpop -a |
|
129 popping patch |
|
130 patch queue now empty |
|
131 |
128 #endif |
132 #endif |
129 |
133 |
|
134 issue3712: test colorization of subrepo diff |
|
135 |
|
136 $ hg init sub |
|
137 $ echo b > sub/b |
|
138 $ hg -R sub commit -Am 'create sub' |
|
139 adding b |
|
140 $ echo 'sub = sub' > .hgsub |
|
141 $ hg add .hgsub |
|
142 $ hg commit -m 'add subrepo sub' |
|
143 $ echo aa >> a |
|
144 $ echo bb >> sub/b |
|
145 |
|
146 $ hg diff --color=always -S |
|
147 \x1b[0;1mdiff --git a/a b/a\x1b[0m (esc) |
|
148 \x1b[0;31;1m--- a/a\x1b[0m (esc) |
|
149 \x1b[0;32;1m+++ b/a\x1b[0m (esc) |
|
150 \x1b[0;35m@@ -7,3 +7,4 @@\x1b[0m (esc) |
|
151 a |
|
152 c |
|
153 c |
|
154 \x1b[0;32m+aa\x1b[0m (esc) |
|
155 \x1b[0;1mdiff --git a/sub/b b/sub/b\x1b[0m (esc) |
|
156 \x1b[0;31;1m--- a/sub/b\x1b[0m (esc) |
|
157 \x1b[0;32;1m+++ b/sub/b\x1b[0m (esc) |
|
158 \x1b[0;35m@@ -1,1 +1,2 @@\x1b[0m (esc) |
|
159 b |
|
160 \x1b[0;32m+bb\x1b[0m (esc) |
|
161 |
130 $ cd .. |
162 $ cd .. |