mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 16:31:02 +03:00
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 Reviewers: #fbhgext, stash Reviewed By: #fbhgext, stash Differential Revision: https://phab.mercurial-scm.org/D146
This commit is contained in:
parent
f95c4e8f49
commit
7cb6b2b906
@ -97,17 +97,19 @@ The first client works on several diffs while the second client lands one of her
|
||||
3 new obsolescence markers
|
||||
updating bookmark master
|
||||
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
|
||||
push doesn't directly go to the server
|
||||
|
||||
$ 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)
|
||||
|
||||
We update to commit 1 to avoid keeping 2, 3, and 4 visible with inhibit
|
||||
|
||||
$ 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
|
||||
the remote
|
||||
|
Loading…
Reference in New Issue
Block a user