D6708: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Tue Aug 6 13:11:14 EDT 2019


pulkit added a comment.


  Applied the following diff in flight which was result of test output changes.
  
    --- /home/pulkit/repo/paccess/tests/test-shelve.t
    +++ /home/pulkit/repo/paccess/tests/test-shelve.t
    @@ -1365,19 +1365,19 @@
     
     #if stripbased
       $ hg log -r 3:: -G
    -  @  changeset:   5:506510493902
    +  @  changeset:   5:f1d5f53e397b
       |  tag:         tip
    -  |  parent:      3:adfeba9a1ac4
    +  |  parent:      3:e28fd7fa7938
       |  user:        shelve at localhost
       |  date:        Thu Jan 01 00:00:00 1970 +0000
       |  summary:     changes to: add A to bars
       |
    -  | @  changeset:   4:8b023952e29c
    +  | @  changeset:   4:fe451a778c81
       |/   user:        test
       |    date:        Thu Jan 01 00:00:00 1970 +0000
       |    summary:     add C to bars
       |
    -  o  changeset:   3:adfeba9a1ac4
    +  o  changeset:   3:e28fd7fa7938
       |  user:        test
       ~  date:        Thu Jan 01 00:00:00 1970 +0000
          summary:     add A to bars
    @@ -1418,13 +1418,13 @@
     
     #if stripbased
       $ hg log -r 3:: -G
    -  @  changeset:   4:8b023952e29c
    +  @  changeset:   4:fe451a778c81
       |  tag:         tip
       |  user:        test
       |  date:        Thu Jan 01 00:00:00 1970 +0000
       |  summary:     add C to bars
       |
    -  o  changeset:   3:adfeba9a1ac4
    +  o  changeset:   3:e28fd7fa7938
       |  user:        test
       ~  date:        Thu Jan 01 00:00:00 1970 +0000
          summary:     add A to bars

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D6708/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D6708

To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel


More information about the Mercurial-devel mailing list