D1974: narrow: import experimental extension from narrowhg revision cb51d673e9c5

mharbison72 (Matt Harbison) phabricator at mercurial-scm.org
Thu Feb 15 22:37:54 EST 2018


mharbison72 added inline comments.

INLINE COMMENTS

> test-narrow-strip.t:81
> +  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
> +  $ hg unbundle .hg/strip-backup/*-backup.hg
> +  adding changesets

The test failures here on Windows seem to be a case of incoming and unbundle getting confused.  Here's some debug info (starting right after the `rm` on line 77), but I'm not sure what to do with it:

  $ hg log -G
  o  changeset:   2:f505d5e96aa8
  |  tag:         tip
  |  parent:      0:a99f4d53924d
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     modify inside
  |
  | @  changeset:   1:9e48d953700d
  |/   user:        test
  |    date:        Thu Jan 01 00:00:00 1970 +0000
  |    summary:     modify outside again
  |
  o  changeset:   0:a99f4d53924d
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     initial
  
  $ hg strip .
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
  saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-backup.hg (glob)
  $ hg log -G
  o  changeset:   1:f505d5e96aa8
  |  tag:         tip
  |  user:        test
  |  date:        Thu Jan 01 00:00:00 1970 +0000
  |  summary:     modify inside
  |
  @  changeset:   0:a99f4d53924d
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     initial
  
  $ hg in --debug --bundle .hg/strip-backup/*-backup.hg
  bundle2-input-part: total payload size 521
  bundle2-input-part: total payload size 24
  comparing with .hg/strip-backup/f505d5e96aa8-2b55e253-backup.hg
  query 1; heads
  searching for changes
  all remote heads known locally
  no changes found
  [1]
  $ hg unbundle --debug .hg/strip-backup/*-backup.hg
  bundle2-input-bundle: 1 params with-transaction
  bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
  adding changesets
  add changeset f505d5e96aa8
  adding manifests
  adding file changes
  adding inside/f1 revisions
  added 0 changesets with 0 changes to 1 files
  bundle2-input-part: total payload size 521
  bundle2-input-part: "phase-heads" supported
  bundle2-input-part: total payload size 24
  bundle2-input-bundle: 1 parts total
  (run 'hg update' to get a working copy)
  $ hg log -G -T '{rev} {desc}\n'
  o  1 modify inside
  |
  @  0 initial

REPOSITORY
  rHG Mercurial

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

To: durin42, #hg-reviewers, indygreg
Cc: mharbison72, idlsoft, martinvonz, indygreg, mercurial-devel


More information about the Mercurial-devel mailing list