This is an archive of the discontinued Mercurial Phabricator instance.

Differential D146

pushrebase: update test after working copy update change
ClosedPublic

Authored by ryanmce on Jul 19 2017, 9:50 AM.
Tags
None
Subscribers
None

Details

Reviewers
stash
Group Reviewers
Restricted Project
Commits
rFBHGXeb20b25c7be6: pushrebase: update test after working copy update change
Summary

D123 failed to update this test as well

Test Plan

Run the test; it now passes

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ryanmce created this revision.Jul 19 2017, 9:50 AM
stash accepted this revision.Jul 19 2017, 10:01 AM
This revision is now accepted and ready to land.Jul 19 2017, 10:01 AM
Closed by commit rFBHGXeb20b25c7be6: pushrebase: update test after working copy update change (authored by ryanmce). · Explain WhyJul 19 2017, 10:09 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-pull-createmarkers.t (4 lines)

Diff 307

tests/test-pull-createmarkers.t

remote: 4 new changesets from the server will be downloaded remote: 4 new changesets from the server will be downloaded
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 4 changesets with 1 changes to 4 files (+1 heads) added 4 changesets with 1 changes to 4 files (+1 heads)
3 new obsolescence markers 3 new obsolescence markers
updating bookmark master updating bookmark master
obsoleted 3 changesets obsoleted 3 changesets
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Here we strip commits 6, 7, 8 to simulate what happens with landcastle, the Here we strip commits 6, 7, 8 to simulate what happens with landcastle, the
push doesn't directly go to the server push doesn't directly go to the server
$ hg strip 6 $ hg strip 6
0 files updated, 0 files merged, 3 files removed, 0 files unresolved
saved backup bundle to $TESTTMP/client/.hg/strip-backup/d446b1b2be43-516f7371-backup.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/d446b1b2be43-516f7371-backup.hg (glob)
We update to commit 1 to avoid keeping 2, 3, and 4 visible with inhibit We update to commit 1 to avoid keeping 2, 3, and 4 visible with inhibit
$ hg update 1 $ hg update 1
0 files updated, 0 files merged, 3 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Here pull should mark 2, 3, and 4 as obsolete since they landed as 6, 7, 8 on Here pull should mark 2, 3, and 4 as obsolete since they landed as 6, 7, 8 on
the remote the remote
$ hg log -G -T '{rev} "{desc}" {remotebookmarks}' $ hg log -G -T '{rev} "{desc}" {remotebookmarks}'
o 5 "add b" o 5 "add b"
| |
| o 4 "add e | o 4 "add e
| | | |