Mercurial > evolve
diff tests/test-stabilize-result.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 | 0c879e986ce4 |
line wrap: on
line diff
--- a/tests/test-stabilize-result.t Fri Aug 29 09:29:02 2014 +0200 +++ b/tests/test-stabilize-result.t Fri Aug 29 14:26:17 2014 +0200 @@ -165,6 +165,7 @@ rebasing to destination parent: 66719795a494 computing new diff committed as (a7cabd7bd9c2|671b9d7eeaec) (re) + working directory is now at (a7cabd7bd9c2|671b9d7eeaec) (re) $ glog @ 14:(a7cabd7bd9c2|671b9d7eeaec)@default\(draft\) bk:\[\] bumped update to 1cf0aacfd363: (re) | @@ -258,6 +259,7 @@ copying changeset 283ccd10e2b8 to 7bc2f5967f5e a committed changeset 21:f344982e63c4 + working directory is now at f344982e63c4 $ hg st $ glog @ 21:f344982e63c4@default(draft) bk:[] More addition