facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-11 01:07:15 +03:00
Code Issues Projects Releases Wiki Activity
0cceb35e49
sapling/tests/fixtures/merge_even/blobs
History
Simon Farnsworth 573f37bc83 Add several more test repositories of different shapes 
Summary:
We want a few more test fixtures that cover different "shapes" of repo
- branching, merging etc - and that test things we don't necessarily expect to
  see in developer use. Add them to the repo as extra fixtures.

The repos have the following shapes (from `hg sl --all` output):
```
@  4f7f3f  simonfar
|  Replace the base
|
o  b65231  simonfar
|  Doubled
|
o  d7542c  simonfar
|  Branch 2
|
| o  168390  simonfar
| |  I think 4 is a nice number
| |
| o  1d8a90  simonfar
| |  Add one
| |
| o  3cda5c  simonfar
|/   Branch 1
|
o  15c40d  simonfar
   base
```

```
@  264f01  simonfar
|  Add 5
|
o  5d4388  simonfar
|  Add 4
|
o  fc2cef  simonfar
|  Add 3
|
o  bc7b4d  simonfar
|  Add 2
|
o  795b81  simonfar
|  Add 1
|
o  4f7f3f  simonfar
|  Replace the base
|
o  b65231  simonfar
|  Doubled
|
o  d7542c  simonfar
|  Branch 2
|
| o  168390  simonfar
| |  I think 4 is a nice number
| |
| o  1d8a90  simonfar
| |  Add one
| |
| o  3cda5c  simonfar
|/   Branch 1
|
o  15c40d  simonfar
   base
```

```
@  49f53a  simonfar
|  Three.four
|
| o  04decb  simonfar
|/   Three.three
|
o  4685e9  simonfar
|  Two.two
|
| o  c27ef5  simonfar
| |  Three.two
| |
| | o  b6a816  simonfar
| |/   Three.one
| |
| o  9e8521  simonfar
|/   Two.one
|
o  ecba69  simonfar
   One
```

```
@    babf5e  simonfar
|\   Merge
| |
| o  4f7f3f  simonfar
| |  Replace the base
| |
| o  b65231  simonfar
| |  Doubled
| |
| o  d7542c  simonfar
| |  Branch 2
| |
o |  168390  simonfar
| |  I think 4 is a nice number
| |
o |  1d8a90  simonfar
| |  Add one
| |
o |  3cda5c  simonfar
|/   Branch 1
|
o  15c40d  simonfar
   base
```

```
@    75742e  simonfar
|\   Merge two branches
| |
| o  264f01  simonfar
| |  Add 5
| |
| o  5d4388  simonfar
| |  Add 4
| |
| o  fc2cef  simonfar
| |  Add 3
| |
| o  bc7b4d  simonfar
| |  Add 2
| |
| o  795b81  simonfar
| |  Add 1
| |
| o  4f7f3f  simonfar
| |  Replace the base
| |
| o  b65231  simonfar
| |  Doubled
| |
| o  d7542c  simonfar
| |  Branch 2
| |
o |  168390  simonfar
| |  I think 4 is a nice number
| |
o |  1d8a90  simonfar
| |  Add one
| |
o |  3cda5c  simonfar
|/   Branch 1
|
o  15c40d  simonfar
   base
```

```
@  cc7f14  simonfar
|  And work
|
o    d59249  simonfar
|\   Merge
| |
o |  03b058  simonfar
| |  Add 5
| |
o |  2fa8b4  simonfar
| |  Add 4
| |
o |  0b94a2  simonfar
| |  Add 3
| |
o |  f61fdc  simonfar
| |  Add 2
| |
o |  36ff88  simonfar
| |  Add 1
| |
o |  170052  simonfar
 /   Two
|
o  33fb49  simonfar
|  Add 5
|
o  f01e18  simonfar
|  Add 4
|
o  163adc  simonfar
|  Add 3
|
o  eee492  simonfar
|  Add 2
|
o  3775a8  simonfar
|  Add 1
|
o  9d374b  simonfar
   One
```

```
@  ec27ab  simonfar
|  And remove
|
o    9c6dd4  simonfar
|\   Merge
| |
o |  03b058  simonfar
| |  Add 5
| |
o |  2fa8b4  simonfar
| |  Add 4
| |
o |  0b94a2  simonfar
| |  Add 3
| |
o |  f61fdc  simonfar
| |  Add 2
| |
o |  36ff88  simonfar
| |  Add 1
| |
o |  170052  simonfar
 /   Two
|
o  64011f  simonfar
|  Add 10
|
o  c1d537  simonfar
|  Add 9
|
o  e819f2  simonfar
|  Add 8
|
o  5a3e8d  simonfar
|  Add 7
|
o  76096a  simonfar
|  Add 6
|
o  33fb49  simonfar
|  Add 5
|
o  f01e18  simonfar
|  Add 4
|
o  163adc  simonfar
|  Add 3
|
o  eee492  simonfar
|  Add 2
|
o  3775a8  simonfar
|  Add 1
|
o  9d374b  simonfar
   One
```

Reviewed By: StanislavGlebik

Differential Revision: D5924752

fbshipit-source-id: ba18df6963c5209e3cfa888862ac22c52d6cebf0
2017-09-28 04:06:24 -07:00
..
blob-changeset-1d8a907f7b4bf50c6a09c16361e2205047ecc5e5.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-changeset-3cda5c78aa35f0f5b09780d971197b51cad4613a.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-changeset-4f7f3fd428bec1a48f9314414b063c706d9c1aed.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-changeset-15c40d0abc36d47fb51c8eaec51ac7aad31f669c.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-changeset-16839021e338500b3cf7c9b871c8a07351697d68.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-changeset-b65231269f651cfe784fd1d97ef02a049a37b8a0.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-changeset-babf5e4dea7ffcf32c3740ff2f1351de4e15c889.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-changeset-d7542c9db7f4c77dab4b315edd328edf1514952f.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-2b0e5ab39d1666531948b7e274fbaf4c86d1b2e3.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-4c788018db9d1cbec2542f40afc8cb8b6a23b80a.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-5d9299349fc01ddd25d0070d149b124d8f10411e.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-5e07195b3213eb0183a79944dfcc1ca235922578.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-9d9f268f6279eac318049e34b1cc0eef6a8e18cb.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-45f4124ae41922b65c14c0ffb3b4c82f17590215.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-49d91de55a8557e72456f5058cd8c1e71711909e.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-059c099e8c05db9fb3c405d969b822c34b64e305.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-2583cf164bf0af8dc8ef931d6e365aa6e0ef3ede.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-961160ee62587ffcaade8c9d60b873942346a025.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-40361943d8a21a60d0715dffa359ea5401271957.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-b0c0a57934ec4171254d57dc1134d66f7396d099.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-b4e8f9431b7ee28e393f0cba32666c5c97d4765c.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-b8e02f6433738021a065f94175c7cd23db5f05be.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-de9e19b2b7a1102ae1c2021fc4ce937faa1d7737.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-node-ec3add9cd79d1751c64913f4cc8f7e2f066fcd76.bincode Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-9c6b057a2b9d96a4067a749ee3b3b0158d390cf1 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-51c64a6f4fc375daf0d24aafbabe4d91b6f4bb44 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-039d444d4af01df54d6d5888f583e54bc3e82f57 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-7448d8798a4380162d4b56f9b452e2f6f9e24e7a Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-01982c766c3f5025422b9185a392b0559459e53e Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-a3db5c13ff90a36963278c6a39e4ee3c22e2a436 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-b96a4484253d28af723296e780d12fd9ada3b5f2 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-b8486c4feca589a4237a1ee428322d7109ede12e Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-d3ee362895b05bce27910213cb0804b385db3a53 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-ec5b70a6faa5ffe0d13602e6af4a46784393f85c Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-f9fe796b4ec0846f53adc3cde287312edb5a91bf Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-f501d6db246217b785d629c4fcdd6b2d8fab8869 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00
blob-sha1-ff9b445a429defb71ccf1b1b6c2273ead52dc668 Add several more test repositories of different shapes 2017-09-28 04:06:24 -07:00