Mercurial > hg
comparison tests/test-push-warn.t @ 22239:0688010ee38f
push: move bookmark discovery with other discovery steps
The discovery of necessary bookmark updates is now done within the "discovery
phase". This opens the door to the inclusion of bookmarks in a unified bundle2
push.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Fri, 15 Aug 2014 18:39:39 -0700 |
| parents | 9fcf772f15ff |
| children | 4ab66de46a96 |
comparison
equal
deleted
inserted
replaced
| 22238:c894fdff56d1 | 22239:0688010ee38f |
|---|---|
| 34 taking quick initial sample | 34 taking quick initial sample |
| 35 searching: 2 queries | 35 searching: 2 queries |
| 36 query 2; still undecided: 1, sample size is: 1 | 36 query 2; still undecided: 1, sample size is: 1 |
| 37 2 total queries | 37 2 total queries |
| 38 listing keys for "phases" | 38 listing keys for "phases" |
| 39 checking for updated bookmarks | |
| 40 listing keys for "bookmarks" | |
| 39 listing keys for "bookmarks" | 41 listing keys for "bookmarks" |
| 40 remote has heads on branch 'default' that are not known locally: 1c9246a22a0a | 42 remote has heads on branch 'default' that are not known locally: 1c9246a22a0a |
| 41 new remote heads on branch 'default': | 43 new remote heads on branch 'default': |
| 42 1e108cc5548c | 44 1e108cc5548c |
| 43 abort: push creates new remote head 1e108cc5548c! | 45 abort: push creates new remote head 1e108cc5548c! |