Mercurial > hg
annotate tests/test-exchange-obsmarkers-case-A4.t @ 35567:07769a04bc66
filelog: add the ability to report the user facing name
This will be used by lfs, but is probably generally useful. There are various
bits of code that reverse engineer this from the index or data file names, but
it seems better to just store it. Especially if there's experimenting with
backing storage other than revlog.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 07 Jan 2018 15:01:59 -0500 |
parents | 9b3f95d9783d |
children | 1a09dad8b85a |
rev | line source |
---|---|
31909
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
1 ============================================ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
2 Testing obsolescence markers push: Cases A.4 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
3 ============================================ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
4 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
5 Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
6 all changesets that requested to be "in sync" after the push (even if they are |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
7 already on both side). |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
8 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
9 This test belongs to a series of tests checking such set is properly computed |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
10 and applied. this does not tests "obsmarkers" discovery capabilities. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
11 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
12 Category A: simple cases |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
13 Testcase 4: Push in the middle of the obsolescence chain |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
14 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
15 A.4 Push in the middle of the obsolescence chain |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
16 ================================================ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
17 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
18 .. (Where we show that we should not push the marker without the successors) |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
19 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
20 .. {{{ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
21 .. B ◔ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
22 .. | |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
23 .. A⇠ø⇠○ A' |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
24 .. |/ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
25 .. ● O |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
26 .. }}} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
27 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
28 .. Markers exist from: |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
29 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
30 .. * `A ø⇠○ A'` |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
31 .. * chain from A |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
32 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
33 .. Command runs: |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
34 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
35 .. * hg push -r B |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
36 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
37 .. Expected exchange: |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
38 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
39 .. * Chain from A |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
40 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
41 .. Expected Exclude: |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
42 .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
43 .. * `Ai ø⇠○ A'` |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
44 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
45 Setup |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
46 ----- |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
47 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
48 $ . $TESTDIR/testlib/exchange-obsmarker-util.sh |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
49 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
50 initial |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
51 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
52 $ setuprepos A.4 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
53 creating test repo for test case A.4 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
54 - pulldest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
55 - main |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
56 - pushdest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
57 cd into `main` and proceed with env setup |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
58 $ cd main |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
59 $ mkcommit A0 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
60 $ mkcommit B |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
61 $ hg update 0 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
62 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
63 $ mkcommit A1 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
64 created new head |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'` |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` |
33542
b11e8c67fb0f
debugobsolete: also report the number of obsoleted changesets
Boris Feld <boris.feld@octobus.net>
parents:
31909
diff
changeset
|
67 obsoleted 1 changesets |
31909
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
68 $ hg log -G --hidden |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
69 @ e5ea8f9c7314 (draft): A1 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
70 | |
35508
9b3f95d9783d
graphlog: add another graph node type, unstable, using character "*" (BC)
Anton Shestakov <av6@dwimlabs.net>
parents:
34661
diff
changeset
|
71 | * 06055a7959d4 (draft): B |
31909
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
72 | | |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
73 | x 28b51eb45704 (draft): A0 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
74 |/ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
75 o a9bdc8b26820 (public): O |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
76 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
77 $ inspect_obsmarkers |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
78 obsstore content |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
79 ================ |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
80 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
81 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
82 $ cd .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
83 $ cd .. |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
84 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
85 Actual Test for first version |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
86 ----------------------------- |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
87 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
88 $ dotest A.4 B -f |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
89 ## Running testcase A.4 |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
90 # testing echange of "B" (06055a7959d4) |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
91 ## initial state |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
92 # obstore: main |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
93 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
94 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
95 # obstore: pushdest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
96 # obstore: pulldest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
97 ## pushing "B" from main to pushdest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
98 pushing to pushdest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
99 searching for changes |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
100 remote: adding changesets |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
101 remote: adding manifests |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
102 remote: adding file changes |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
103 remote: added 2 changesets with 2 changes to 2 files |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
104 remote: 1 new obsolescence markers |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
105 ## post push state |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
106 # obstore: main |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
107 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
108 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
109 # obstore: pushdest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
110 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
111 # obstore: pulldest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
112 ## pulling "06055a7959d4" from main into pulldest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
113 pulling from main |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
114 searching for changes |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
115 adding changesets |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
116 adding manifests |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
117 adding file changes |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
118 added 2 changesets with 2 changes to 2 files |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
119 1 new obsolescence markers |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
33542
diff
changeset
|
120 new changesets 28b51eb45704:06055a7959d4 |
31909
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
121 (run 'hg update' to get a working copy) |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
122 ## post pull state |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
123 # obstore: main |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
124 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
125 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
126 # obstore: pushdest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
127 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
128 # obstore: pulldest |
df0f18546e1e
obsolescence: add test case A-4 for obsolescence markers exchange
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff
changeset
|
129 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |