comparison tests/test-stabilize-result.t @ 3739:0bfc4fe3baf8

evolve: use hg.updaterepo() instead of hg.update() to hide stats
author Pulkit Goyal <7895pulkit@gmail.com>
date Sun, 29 Apr 2018 19:11:29 +0530
parents ed3f69fb67bf
children 07e246deb612
comparison
equal deleted inserted replaced
3738:ed3f69fb67bf 3739:0bfc4fe3baf8
415 merge:[17] More addition (2) 415 merge:[17] More addition (2)
416 with: [18] More addition (2) 416 with: [18] More addition (2)
417 base: [16] More addition 417 base: [16] More addition
418 updating to "local" conflict 418 updating to "local" conflict
419 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 419 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
420 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
421 working directory is now at e015aa78acee 420 working directory is now at e015aa78acee
422 $ glog 421 $ glog
423 @ 18:e015aa78acee@default(draft) bk:[] More addition (2) 422 @ 18:e015aa78acee@default(draft) bk:[] More addition (2)
424 | 423 |
425 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: 424 | o 11:8fc63fe1f297@default(draft) bk:[] phase-divergent update to 1cf0aacfd363: