Mercurial > hg
annotate tests/test-obsolete-distributed.t @ 34651:e88dbbcf2a56
test: add an extra case for obsolescence distributed case
This changeset introduces a new documented test case for a distributed
obsolescence scenario. The scenario involves a simple case where some
obsolescence markers are retrieved before the changeset they affect. See the
test case documentation for details.
We also test variants where the changesets are added from a bundle.
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Sat, 30 Sep 2017 22:37:20 +0100 |
parents | 6c85f4e3d914 |
children | eb586ed5d8ce |
rev | line source |
---|---|
34650
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
1 ============================= |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
2 Test distributed obsolescence |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
3 ============================= |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
4 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
5 This file test various cases where data (changeset, phase, obsmarkers) is |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
6 added to the repository in a specific order. Usually, this order is unlikely |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
7 to happen in the local case but can easily happen in the distributed case. |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
8 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
9 $ unset HGUSER |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
10 $ unset EMAIL |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
11 $ . $TESTDIR/testlib/obsmarker-common.sh |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
12 $ cat >> $HGRCPATH << EOF |
34651
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
13 > [extensions] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
14 > rebase = |
34650
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
15 > [experimental] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
16 > evolution = all |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
17 > [phases] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
18 > publish = False |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
19 > [templates] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
20 > obsfatesuccessors = "{if(successors, " as ")}{join(successors, ", ")}" |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
21 > obsfateverb = "{obsfateverb(successors)}" |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
22 > obsfateoperations = "{if(obsfateoperations(markers), " using {join(obsfateoperations(markers), ", ")}")}" |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
23 > obsfateusers = "{if(obsfateusers(markers), " by {join(obsfateusers(markers), ", ")}")}" |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
24 > obsfatedate = "{if(obsfatedate(markers), "{ifeq(min(obsfatedate(markers)), max(obsfatedate(markers)), " (at {min(obsfatedate(markers))|isodate})", " (between {min(obsfatedate(markers))|isodate} and {max(obsfatedate(markers))|isodate})")}")}" |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
25 > obsfate = "{obsfateverb}{obsfateoperations}{obsfatesuccessors}{obsfateusers}{obsfatedate}; " |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
26 > [ui] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
27 > logtemplate= {rev}:{node|short} {desc} {if(succsandmarkers, "[{succsandmarkers % "{obsfate}"}]")}\n |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
28 > EOF |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
29 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
30 Check distributed chain building |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
31 ================================ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
32 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
33 Test case where a changeset is marked as a successor of another local |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
34 changeset while the successor has already been obsoleted remotely. |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
35 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
36 The chain of evolution should seamlessly connect and all but the new version |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
37 (created remotely) should be seen as obsolete. |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
38 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
39 Initial setup |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
40 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
41 $ mkdir distributed-chain-building |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
42 $ cd distributed-chain-building |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
43 $ hg init server |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
44 $ cd server |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
45 $ cat << EOF >> .hg/hgrc |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
46 > [ui] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
47 > username = server |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
48 > EOF |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
49 $ mkcommit ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
50 $ mkcommit c_A0 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
51 $ hg up 'desc("ROOT")' |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
52 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
53 $ mkcommit c_A1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
54 created new head |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
55 $ hg up 'desc("ROOT")' |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
56 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
57 $ mkcommit c_B0 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
58 created new head |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
59 $ hg debugobsolete `getid 'desc("c_A0")'` `getid 'desc("c_A1")'` |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
60 obsoleted 1 changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
61 $ hg log -G --hidden |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
62 @ 3:e5d7dda7cd28 c_B0 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
63 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
64 | o 2:7f6b0a6f5c25 c_A1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
65 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
66 | x 1:e1b46f0f979f c_A0 [rewritten as 2:7f6b0a6f5c25 by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
67 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
68 o 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
69 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
70 $ hg debugobsolete |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
71 e1b46f0f979f52748347ff8729c59f2ef56e6fe2 7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
72 $ cd .. |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
73 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
74 duplicate the repo for the client: |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
75 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
76 $ cp -R server client |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
77 $ cat << EOF >> client/.hg/hgrc |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
78 > [paths] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
79 > default = ../server/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
80 > [ui] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
81 > username = client |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
82 > EOF |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
83 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
84 server side: create new revision on the server (obsoleting another one) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
85 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
86 $ cd server |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
87 $ hg up 'desc("ROOT")' |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
88 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
89 $ mkcommit c_B1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
90 created new head |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
91 $ hg debugobsolete `getid 'desc("c_B0")'` `getid 'desc("c_B1")'` |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
92 obsoleted 1 changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
93 $ hg log -G |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
94 @ 4:391a2bf12b1b c_B1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
95 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
96 | o 2:7f6b0a6f5c25 c_A1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
97 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
98 o 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
99 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
100 $ hg log -G --hidden |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
101 @ 4:391a2bf12b1b c_B1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
102 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
103 | x 3:e5d7dda7cd28 c_B0 [rewritten as 4:391a2bf12b1b by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
104 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
105 | o 2:7f6b0a6f5c25 c_A1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
106 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
107 | x 1:e1b46f0f979f c_A0 [rewritten as 2:7f6b0a6f5c25 by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
108 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
109 o 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
110 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
111 $ hg debugobsolete |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
112 e1b46f0f979f52748347ff8729c59f2ef56e6fe2 7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
113 e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 391a2bf12b1b8b05a72400ae36b26d50a091dc22 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
114 $ cd .. |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
115 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
116 client side: create a marker between two common changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
117 (client is not aware of the server activity yet) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
118 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
119 $ cd client |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
120 $ hg debugobsolete `getid 'desc("c_A1")'` `getid 'desc("c_B0")'` |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
121 obsoleted 1 changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
122 $ hg log -G |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
123 @ 3:e5d7dda7cd28 c_B0 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
124 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
125 o 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
126 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
127 $ hg log -G --hidden |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
128 @ 3:e5d7dda7cd28 c_B0 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
129 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
130 | x 2:7f6b0a6f5c25 c_A1 [rewritten as 3:e5d7dda7cd28 by client (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
131 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
132 | x 1:e1b46f0f979f c_A0 [rewritten as 2:7f6b0a6f5c25 by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
133 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
134 o 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
135 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
136 $ hg debugobsolete |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
137 e1b46f0f979f52748347ff8729c59f2ef56e6fe2 7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
138 7f6b0a6f5c25345a83870963efd827c1798a5959 e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'client'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
139 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
140 client side: pull from the server |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
141 (the new successors should take over) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
142 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
143 $ hg up 'desc("ROOT")' |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
144 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
145 $ hg pull |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
146 pulling from $TESTTMP/distributed-chain-building/server (glob) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
147 searching for changes |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
148 adding changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
149 adding manifests |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
150 adding file changes |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
151 added 1 changesets with 1 changes to 1 files (+1 heads) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
152 1 new obsolescence markers |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
153 obsoleted 1 changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
154 (run 'hg heads' to see heads) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
155 $ hg log -G |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
156 o 4:391a2bf12b1b c_B1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
157 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
158 @ 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
159 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
160 $ hg log -G --hidden |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
161 o 4:391a2bf12b1b c_B1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
162 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
163 | x 3:e5d7dda7cd28 c_B0 [rewritten as 4:391a2bf12b1b by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
164 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
165 | x 2:7f6b0a6f5c25 c_A1 [rewritten as 3:e5d7dda7cd28 by client (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
166 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
167 | x 1:e1b46f0f979f c_A0 [rewritten as 2:7f6b0a6f5c25 by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
168 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
169 @ 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
170 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
171 $ hg debugobsolete |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
172 e1b46f0f979f52748347ff8729c59f2ef56e6fe2 7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
173 7f6b0a6f5c25345a83870963efd827c1798a5959 e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'client'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
174 e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 391a2bf12b1b8b05a72400ae36b26d50a091dc22 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
175 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
176 server side: receive client push |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
177 (the other way around, pushing to the server, the obsolete changesets stay |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
178 obsolete on the server side but the marker is sent out.) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
179 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
180 $ hg rollback |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
181 repository tip rolled back to revision 3 (undo pull) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
182 $ hg push -f |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
183 pushing to $TESTTMP/distributed-chain-building/server (glob) |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
184 searching for changes |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
185 adding changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
186 adding manifests |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
187 adding file changes |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
188 added 0 changesets with 0 changes to 1 files |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
189 1 new obsolescence markers |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
190 obsoleted 1 changesets |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
191 $ hg -R ../server/ log -G |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
192 @ 4:391a2bf12b1b c_B1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
193 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
194 o 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
195 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
196 $ hg -R ../server/ log -G --hidden |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
197 @ 4:391a2bf12b1b c_B1 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
198 | |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
199 | x 3:e5d7dda7cd28 c_B0 [rewritten as 4:391a2bf12b1b by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
200 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
201 | x 2:7f6b0a6f5c25 c_A1 [rewritten as 3:e5d7dda7cd28 by client (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
202 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
203 | x 1:e1b46f0f979f c_A0 [rewritten as 2:7f6b0a6f5c25 by server (at 1970-01-01 00:00 +0000); ] |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
204 |/ |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
205 o 0:e82fb8d02bbf ROOT |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
206 |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
207 $ hg debugobsolete |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
208 e1b46f0f979f52748347ff8729c59f2ef56e6fe2 7f6b0a6f5c25345a83870963efd827c1798a5959 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'server'} |
6c85f4e3d914
test: add a test file dedicated to an important distributed case
Boris Feld <boris.feld@octobus.net>
parents:
diff
changeset
|
209 7f6b0a6f5c25345a83870963efd827c1798a5959 e5d7dda7cd28e6b3f79437e5b8122a38ece0255c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'client'} |
34651
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
210 $ cd .. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
211 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
212 Check getting changesets after getting the markers |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
213 ================================================= |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
214 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
215 This test case covers the scenario where commits are received -after- we |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
216 received some obsolescence markers turning them obsolete. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
217 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
218 For example, we pull some successors from a repository (with associated |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
219 predecessors marker chain) and then later we pull some intermediate |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
220 precedessors changeset from another repository. Obsolescence markers must |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
221 apply to the intermediate changeset. They have to be obsolete (and hidden). |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
222 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
223 Avoiding pulling the changeset in the first place is a tricky decision because |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
224 there could be non-obsolete ancestors that need to be pulled, but the |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
225 discovery cannot currently find these (this is not the case in this tests). In |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
226 addition, we could also have to pull the changeset because they have children. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
227 In this case, they would not be hidden (yet) because of the orphan descendant, |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
228 but they would still have to be obsolete. (This is not tested in this case |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
229 either). |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
230 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
231 $ mkdir distributed-chain-building |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
232 $ cd distributed-chain-building |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
233 $ hg init server |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
234 $ cd server |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
235 $ cat << EOF >> .hg/hgrc |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
236 > [ui] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
237 > username = server |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
238 > EOF |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
239 $ mkcommit ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
240 $ cd .. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
241 $ hg clone server repo-Alice |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
242 updating to branch default |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
243 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
244 $ cat << EOF >> repo-Alice/.hg/hgrc |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
245 > [ui] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
246 > username = alice |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
247 > EOF |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
248 $ hg clone server repo-Bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
249 updating to branch default |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
250 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
251 $ cat << EOF >> repo-Bob/.hg/hgrc |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
252 > [ui] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
253 > username = bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
254 > EOF |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
255 $ hg clone server repo-Celeste |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
256 updating to branch default |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
257 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
258 $ cat << EOF >> repo-Celeste/.hg/hgrc |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
259 > [ui] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
260 > username = celeste |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
261 > EOF |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
262 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
263 Create some changesets locally |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
264 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
265 $ cd repo-Alice |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
266 $ mkcommit c_A0 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
267 $ mkcommit c_B0 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
268 $ cd .. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
269 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
270 Bob pulls from Alice and rewrites them |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
271 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
272 $ cd repo-Bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
273 $ hg pull ../repo-Alice |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
274 pulling from ../repo-Alice |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
275 searching for changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
276 adding changesets |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
277 adding manifests |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
278 adding file changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
279 added 2 changesets with 2 changes to 2 files |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
280 (run 'hg update' to get a working copy) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
281 $ hg up 'desc("c_A")' |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
282 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
283 $ hg commit --amend -m 'c_A1' |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
284 $ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with the rebase |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
285 rebasing 2:ef908e42ce65 "c_B0" |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
286 $ hg up |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
287 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
288 $ hg commit --amend -m 'c_B1' |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
289 $ hg log -G |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
290 @ 5:956063ac4557 c_B1 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
291 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
292 o 3:5b5708a437f2 c_A1 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
293 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
294 o 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
295 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
296 $ hg log -G --hidden |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
297 @ 5:956063ac4557 c_B1 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
298 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
299 | x 4:5ffb9e311b35 c_B0 [rewritten using amend as 5:956063ac4557 by bob (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
300 |/ |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
301 o 3:5b5708a437f2 c_A1 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
302 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
303 | x 2:ef908e42ce65 c_B0 [rewritten using rebase as 4:5ffb9e311b35 by bob (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
304 | | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
305 | x 1:d33b0a3a6464 c_A0 [rewritten using amend as 3:5b5708a437f2 by bob (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
306 |/ |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
307 o 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
308 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
309 $ hg debugobsolete |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
310 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
311 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
312 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
313 $ cd .. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
314 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
315 Celeste pulls from Bob and rewrites them again |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
316 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
317 $ cd repo-Celeste |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
318 $ hg pull ../repo-Bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
319 pulling from ../repo-Bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
320 searching for changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
321 adding changesets |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
322 adding manifests |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
323 adding file changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
324 added 2 changesets with 2 changes to 2 files |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
325 3 new obsolescence markers |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
326 (run 'hg update' to get a working copy) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
327 $ hg up 'desc("c_A")' |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
328 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
329 $ hg commit --amend -m 'c_A2' |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
330 $ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with the rebase |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
331 rebasing 2:956063ac4557 "c_B1" |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
332 $ hg up |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
333 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
334 $ hg commit --amend -m 'c_B2' |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
335 $ hg log -G |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
336 @ 5:77ae25d99ff0 c_B2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
337 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
338 o 3:9866d64649a5 c_A2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
339 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
340 o 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
341 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
342 $ hg log -G --hidden |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
343 @ 5:77ae25d99ff0 c_B2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
344 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
345 | x 4:3cf8de21cc22 c_B1 [rewritten using amend as 5:77ae25d99ff0 by celeste (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
346 |/ |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
347 o 3:9866d64649a5 c_A2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
348 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
349 | x 2:956063ac4557 c_B1 [rewritten using rebase as 4:3cf8de21cc22 by celeste (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
350 | | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
351 | x 1:5b5708a437f2 c_A1 [rewritten using amend as 3:9866d64649a5 by celeste (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
352 |/ |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
353 o 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
354 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
355 $ hg debugobsolete |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
356 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
357 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
358 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
359 5b5708a437f27665db42c5a261a539a1bcb2a8c2 9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
360 956063ac4557828781733b2d5677a351ce856f59 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
361 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
362 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
363 Celeste now pushes to the server |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
364 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
365 (note: it would be enough to just have direct Celeste -> Alice exchange here. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
366 However using a central server seems more common) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
367 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
368 $ hg push |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
369 pushing to $TESTTMP/distributed-chain-building/distributed-chain-building/server (glob) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
370 searching for changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
371 adding changesets |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
372 adding manifests |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
373 adding file changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
374 added 2 changesets with 2 changes to 2 files |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
375 6 new obsolescence markers |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
376 $ cd .. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
377 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
378 Now Alice pulls from the server, then from Bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
379 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
380 Alice first retrieves the new evolution of its changesets and associated markers |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
381 from the server (note: could be from Celeste directly) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
382 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
383 $ cd repo-Alice |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
384 $ hg up 'desc(ROOT)' |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
385 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
386 $ hg pull |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
387 pulling from $TESTTMP/distributed-chain-building/distributed-chain-building/server (glob) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
388 searching for changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
389 adding changesets |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
390 adding manifests |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
391 adding file changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
392 added 2 changesets with 0 changes to 2 files (+1 heads) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
393 6 new obsolescence markers |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
394 obsoleted 2 changesets |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
395 (run 'hg heads' to see heads) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
396 $ hg debugobsolete |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
397 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
398 5b5708a437f27665db42c5a261a539a1bcb2a8c2 9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
399 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
400 956063ac4557828781733b2d5677a351ce856f59 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
401 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
402 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
403 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
404 Then, she pulls from Bob, pulling predecessors of the changeset she has |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
405 already pulled. The changesets are not obsoleted in the Bob repo yet. Their |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
406 successors do not exist in Bob repository yet. |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
407 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
408 $ hg pull ../repo-Bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
409 pulling from ../repo-Bob |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
410 searching for changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
411 adding changesets |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
412 adding manifests |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
413 adding file changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
414 added 2 changesets with 0 changes to 2 files (+1 heads) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
415 (run 'hg heads' to see heads) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
416 $ hg log -G |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
417 o 4:77ae25d99ff0 c_B2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
418 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
419 o 3:9866d64649a5 c_A2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
420 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
421 @ 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
422 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
423 $ hg debugobsolete |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
424 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
425 5b5708a437f27665db42c5a261a539a1bcb2a8c2 9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
426 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
427 956063ac4557828781733b2d5677a351ce856f59 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
428 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
429 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
430 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
431 Same tests, but change coming from a bundle |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
432 (testing with a bundle is interesting because absolutely no discovery or |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
433 decision is made in that case, so receiving the changesets are not an option). |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
434 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
435 $ hg rollback |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
436 repository tip rolled back to revision 4 (undo pull) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
437 $ hg log -G |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
438 o 4:77ae25d99ff0 c_B2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
439 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
440 o 3:9866d64649a5 c_A2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
441 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
442 @ 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
443 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
444 $ hg debugobsolete |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
445 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
446 5b5708a437f27665db42c5a261a539a1bcb2a8c2 9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
447 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
448 956063ac4557828781733b2d5677a351ce856f59 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
449 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
450 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
451 $ hg -R ../repo-Bob bundle ../step-1.hg |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
452 searching for changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
453 2 changesets found |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
454 $ hg unbundle ../step-1.hg |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
455 adding changesets |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
456 adding manifests |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
457 adding file changes |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
458 added 2 changesets with 0 changes to 2 files (+1 heads) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
459 (run 'hg heads' to see heads) |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
460 $ hg log -G |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
461 o 4:77ae25d99ff0 c_B2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
462 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
463 o 3:9866d64649a5 c_A2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
464 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
465 @ 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
466 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
467 $ hg log -G --hidden |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
468 x 6:956063ac4557 c_B1 [rewritten using amend, rebase as 4:77ae25d99ff0 by celeste (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
469 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
470 x 5:5b5708a437f2 c_A1 [rewritten using amend as 3:9866d64649a5 by celeste (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
471 | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
472 | o 4:77ae25d99ff0 c_B2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
473 | | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
474 | o 3:9866d64649a5 c_A2 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
475 |/ |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
476 | x 2:ef908e42ce65 c_B0 [rewritten using amend, rebase as 6:956063ac4557 by bob (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
477 | | |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
478 | x 1:d33b0a3a6464 c_A0 [rewritten using amend as 5:5b5708a437f2 by bob (at 1970-01-01 00:00 +0000); ] |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
479 |/ |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
480 @ 0:e82fb8d02bbf ROOT |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
481 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
482 $ hg debugobsolete |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
483 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 77ae25d99ff07889e181126b1171b94bec8e5227 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
484 5b5708a437f27665db42c5a261a539a1bcb2a8c2 9866d64649a5d9c5991fe119c7b2c33898114e10 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
485 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 956063ac4557828781733b2d5677a351ce856f59 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
486 956063ac4557828781733b2d5677a351ce856f59 3cf8de21cc2282186857d2266eb6b1f9cb85ecf3 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'celeste'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
487 d33b0a3a64647d79583526be8107802b1f9fedfa 5b5708a437f27665db42c5a261a539a1bcb2a8c2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'amend', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
488 ef908e42ce65ef57f970d799acaddde26f58a4cc 5ffb9e311b35f6ab6f76f667ca5d6e595645481b 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'rebase', 'user': 'bob'} |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
489 |
e88dbbcf2a56
test: add an extra case for obsolescence distributed case
Boris Feld <boris.feld@octobus.net>
parents:
34650
diff
changeset
|
490 $ cd .. |