comparison tests/test-stabilize-order.t @ 1099:bac4e0bc9f6a stable

evolve: write a status message when the working directory changes Evolve changes the working directory during atop, etc which can confuse people as they are not aware that this happend. The ideal solution is to not have evolve change it, however mercurial limitations don't allow us to do that at the moment. So instead we are printing a status message that the working directory changed.
author David Soria Parra <davidsp@fb.com>
date Fri, 29 Aug 2014 14:26:17 +0200
parents 5d063fed9e3d
children cc3e68120185
comparison
equal deleted inserted replaced
1098:1527ec81337e 1099:bac4e0bc9f6a
69 atop:[7] adda 69 atop:[7] adda
70 hg rebase -r 22619daeed78 -d 005fe5914f78 70 hg rebase -r 22619daeed78 -d 005fe5914f78
71 resolving manifests 71 resolving manifests
72 getting b 72 getting b
73 b 73 b
74 working directory is now at bede829dd2d3
74 $ glog 75 $ glog
75 @ 8:bede829dd2d3@default(draft) addb 76 @ 8:bede829dd2d3@default(draft) addb
76 | 77 |
77 o 7:005fe5914f78@default(draft) adda 78 o 7:005fe5914f78@default(draft) adda
78 | 79 |
97 resolving manifests 98 resolving manifests
98 getting b 99 getting b
99 resolving manifests 100 resolving manifests
100 getting c 101 getting c
101 c 102 c
103 working directory is now at 65095d7d0dd5
102 $ hg debugobsolete > successors.new 104 $ hg debugobsolete > successors.new
103 $ diff -u successors.old successors.new 105 $ diff -u successors.old successors.new
104 --- successors.old* (glob) 106 --- successors.old* (glob)
105 +++ successors.new* (glob) 107 +++ successors.new* (glob)
106 @@ -3,3 +3,4 @@ 108 @@ -3,3 +3,4 @@
157 removing c 159 removing c
158 getting b 160 getting b
159 resolving manifests 161 resolving manifests
160 getting c 162 getting c
161 c 163 c
164 working directory is now at e99ecf51c867
162 $ glog 165 $ glog
163 @ 12:e99ecf51c867@default(draft) addc 166 @ 12:e99ecf51c867@default(draft) addc
164 | 167 |
165 o 11:036cf654e942@default(draft) addb 168 o 11:036cf654e942@default(draft) addb
166 | 169 |