##// END OF EJS Templates
evolution: report new unstable changesets...
Martin von Zweigbergk -
r35754:1a09dad8 default
parent child Browse files
Show More
@@ -1222,6 +1222,9 b' class simplekeyvaluefile(object):'
1222 'unbundle',
1222 'unbundle',
1223 ]
1223 ]
1224
1224
1225 # A marker that tells the evolve extension to suppress its own reporting
1226 _reportstroubledchangesets = True
1227
1225 def registersummarycallback(repo, otr, txnname=''):
1228 def registersummarycallback(repo, otr, txnname=''):
1226 """register a callback to issue a summary after the transaction is closed
1229 """register a callback to issue a summary after the transaction is closed
1227 """
1230 """
@@ -1257,6 +1260,32 b' def registersummarycallback(repo, otr, t'
1257 repo.ui.status(_('obsoleted %i changesets\n')
1260 repo.ui.status(_('obsoleted %i changesets\n')
1258 % len(obsoleted))
1261 % len(obsoleted))
1259
1262
1263 if obsolete.isenabled(repo, obsolete.createmarkersopt):
1264 instabilitytypes = [
1265 ('orphan', 'orphan'),
1266 ('phase-divergent', 'phasedivergent'),
1267 ('content-divergent', 'contentdivergent'),
1268 ]
1269
1270 def getinstabilitycounts(repo):
1271 filtered = repo.changelog.filteredrevs
1272 counts = {}
1273 for instability, revset in instabilitytypes:
1274 counts[instability] = len(set(obsolete.getrevs(repo, revset)) -
1275 filtered)
1276 return counts
1277
1278 oldinstabilitycounts = getinstabilitycounts(repo)
1279 @reportsummary
1280 def reportnewinstabilities(repo, tr):
1281 newinstabilitycounts = getinstabilitycounts(repo)
1282 for instability, revset in instabilitytypes:
1283 delta = (newinstabilitycounts[instability] -
1284 oldinstabilitycounts[instability])
1285 if delta > 0:
1286 repo.ui.warn(_('%i new %s changesets\n') %
1287 (delta, instability))
1288
1260 if txmatch(_reportnewcssource):
1289 if txmatch(_reportnewcssource):
1261 @reportsummary
1290 @reportsummary
1262 def reportnewcs(repo, tr):
1291 def reportnewcs(repo, tr):
@@ -185,6 +185,7 b' With allowunstable, amend could work in '
185 > EOF
185 > EOF
186
186
187 $ hg amend
187 $ hg amend
188 1 new orphan changesets
188 $ hg log -T '{rev} {node|short} {desc}\n' -G
189 $ hg log -T '{rev} {node|short} {desc}\n' -G
189 @ 3 be169c7e8dbe B
190 @ 3 be169c7e8dbe B
190 |
191 |
@@ -70,6 +70,11 b' Beat up tags caches:'
70 $ damage "tags --hidden" tags2
70 $ damage "tags --hidden" tags2
71 $ damage tags tags2-visible
71 $ damage tags tags2-visible
72 $ damage "tag -f t3" hgtagsfnodes1
72 $ damage "tag -f t3" hgtagsfnodes1
73 1 new orphan changesets
74 1 new orphan changesets
75 1 new orphan changesets
76 1 new orphan changesets
77 1 new orphan changesets
73
78
74 Beat up branch caches:
79 Beat up branch caches:
75
80
@@ -605,6 +605,7 b' Test that rewriting leaving instability '
605 babar
605 babar
606
606
607 $ hg commit --amend
607 $ hg commit --amend
608 1 new orphan changesets
608 $ hg log -r 'orphan()'
609 $ hg log -r 'orphan()'
609 changeset: 16:37973c7e0b61
610 changeset: 16:37973c7e0b61
610 branch: a
611 branch: a
@@ -206,6 +206,7 b' Create obsmarkers via comments'
206 > \|/
206 > \|/
207 > A
207 > A
208 > EOS
208 > EOS
209 1 new orphan changesets
209
210
210 $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
211 $ hg log -r 'sort(all(), topo)' -G --hidden -T '{desc} {node}'
211 * G 711f53bbef0bebd12eb6f0511d5e2e998b984846
212 * G 711f53bbef0bebd12eb6f0511d5e2e998b984846
@@ -74,6 +74,7 b' initial'
74 created new head
74 created new head
75 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
75 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
76 obsoleted 1 changesets
76 obsoleted 1 changesets
77 1 new orphan changesets
77 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
78 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
78 obsoleted 1 changesets
79 obsoleted 1 changesets
79 $ hg log -G --hidden
80 $ hg log -G --hidden
@@ -163,6 +164,7 b' other variant: changeset known in remote'
163 created new head
164 created new head
164 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
165 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
165 obsoleted 1 changesets
166 obsoleted 1 changesets
167 1 new orphan changesets
166 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
168 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'`
167 obsoleted 1 changesets
169 obsoleted 1 changesets
168 $ hg log -G --hidden
170 $ hg log -G --hidden
@@ -218,6 +220,7 b' test obsmarkers exchange.'
218 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
220 remote: added 1 changesets with 1 changes to 1 files (+1 heads)
219 remote: 1 new obsolescence markers
221 remote: 1 new obsolescence markers
220 remote: obsoleted 1 changesets
222 remote: obsoleted 1 changesets
223 remote: 1 new orphan changesets
221 ## post push state
224 ## post push state
222 # obstore: main
225 # obstore: main
223 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
226 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -234,6 +237,7 b' test obsmarkers exchange.'
234 added 1 changesets with 1 changes to 1 files (+1 heads)
237 added 1 changesets with 1 changes to 1 files (+1 heads)
235 1 new obsolescence markers
238 1 new obsolescence markers
236 obsoleted 1 changesets
239 obsoleted 1 changesets
240 1 new orphan changesets
237 new changesets e5ea8f9c7314
241 new changesets e5ea8f9c7314
238 (run 'hg heads' to see heads, 'hg merge' to merge)
242 (run 'hg heads' to see heads, 'hg merge' to merge)
239 ## post pull state
243 ## post pull state
@@ -65,6 +65,7 b' initial'
65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
65 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A0)'`
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
66 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
67 obsoleted 1 changesets
67 obsoleted 1 changesets
68 1 new orphan changesets
68 $ hg log -G --hidden
69 $ hg log -G --hidden
69 @ e5ea8f9c7314 (draft): A1
70 @ e5ea8f9c7314 (draft): A1
70 |
71 |
@@ -71,6 +71,7 b' initial'
71 $ mkcommit B1
71 $ mkcommit B1
72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
72 $ hg debugobsolete --hidden `getid 'desc(A0)'` `getid 'desc(A1)'`
73 obsoleted 1 changesets
73 obsoleted 1 changesets
74 2 new orphan changesets
74 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
75 $ hg debugobsolete --hidden aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(B0)'`
75 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
76 $ hg debugobsolete --hidden `getid 'desc(B0)'` `getid 'desc(B1)'`
76 obsoleted 1 changesets
77 obsoleted 1 changesets
@@ -58,6 +58,7 b' Initial'
58 $ mkcommit A
58 $ mkcommit A
59 $ mkcommit B
59 $ mkcommit B
60 $ hg prune -qd '0 0' '.~1'
60 $ hg prune -qd '0 0' '.~1'
61 1 new orphan changesets
61 $ hg prune -qd '0 0' .
62 $ hg prune -qd '0 0' .
62 $ hg log -G --hidden
63 $ hg log -G --hidden
63 x f6fbb35d8ac9 (draft): B
64 x f6fbb35d8ac9 (draft): B
@@ -67,6 +67,7 b' Implemented as the non-split version'
67 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
67 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(B)'`
68 obsoleted 1 changesets
68 obsoleted 1 changesets
69 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
69 $ hg debugobsolete --hidden `getid 'desc(A)'` `getid 'desc(C)'`
70 2 new content-divergent changesets
70 $ hg prune -qd '0 0' .
71 $ hg prune -qd '0 0' .
71 $ hg log -G --hidden
72 $ hg log -G --hidden
72 x 7f7f229b13a6 (draft): C
73 x 7f7f229b13a6 (draft): C
@@ -62,6 +62,7 b' initial'
62 created new head
62 created new head
63 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
63 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'`
64 obsoleted 1 changesets
64 obsoleted 1 changesets
65 1 new orphan changesets
65 $ hg prune -d '0 0' 'desc(B)'
66 $ hg prune -d '0 0' 'desc(B)'
66 obsoleted 1 changesets
67 obsoleted 1 changesets
67 $ hg strip --hidden -q 'desc(A0)'
68 $ hg strip --hidden -q 'desc(A0)'
@@ -60,6 +60,7 b' initial'
60 $ mkcommit B1
60 $ mkcommit B1
61 $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
61 $ hg debugobsolete `getid 'desc(A0)'` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
62 obsoleted 1 changesets
62 obsoleted 1 changesets
63 1 new orphan changesets
63 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
64 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(A1)'`
64 $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
65 $ hg debugobsolete `getid 'desc(B0)'` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
65 obsoleted 1 changesets
66 obsoleted 1 changesets
@@ -222,6 +222,7 b' Test that rewriting leaving instability '
222 [1]
222 [1]
223 $ echo c >> c
223 $ echo c >> c
224 $ hg histedit --continue
224 $ hg histedit --continue
225 1 new orphan changesets
225
226
226 $ hg log -r 'orphan()'
227 $ hg log -r 'orphan()'
227 11:c13eb81022ca f (no-eol)
228 11:c13eb81022ca f (no-eol)
@@ -333,6 +333,7 b' Test setup'
333
333
334 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
334 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
335 obsoleted 1 changesets
335 obsoleted 1 changesets
336 1 new orphan changesets
336 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'`
337 $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(C0)'`
337 obsoleted 1 changesets
338 obsoleted 1 changesets
338
339
@@ -412,6 +413,7 b' Test setup'
412 updating to a hidden changeset 471f378eab4c
413 updating to a hidden changeset 471f378eab4c
413 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
414 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
414 $ hg commit --amend -m "A2"
415 $ hg commit --amend -m "A2"
416 2 new content-divergent changesets
415 $ hg log --hidden -G
417 $ hg log --hidden -G
416 @ changeset: 3:65b757b745b9
418 @ changeset: 3:65b757b745b9
417 | tag: tip
419 | tag: tip
@@ -498,6 +500,7 b' Test setup'
498
500
499 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
501 $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(C0)'`
500 obsoleted 1 changesets
502 obsoleted 1 changesets
503 1 new orphan changesets
501 $ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'`
504 $ hg debugobsolete `getid 'desc(B1)'` `getid 'desc(C0)'`
502 obsoleted 1 changesets
505 obsoleted 1 changesets
503
506
@@ -591,6 +591,7 b' Simulate a fold'
591 created new head
591 created new head
592 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
592 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
593 obsoleted 1 changesets
593 obsoleted 1 changesets
594 1 new orphan changesets
594 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
595 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
595 obsoleted 1 changesets
596 obsoleted 1 changesets
596
597
@@ -817,6 +818,7 b' Test setup'
817 updating to a hidden changeset 471f378eab4c
818 updating to a hidden changeset 471f378eab4c
818 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
819 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
819 $ hg commit --amend -m "A2"
820 $ hg commit --amend -m "A2"
821 2 new content-divergent changesets
820 $ hg log --hidden -G
822 $ hg log --hidden -G
821 @ changeset: 3:65b757b745b9
823 @ changeset: 3:65b757b745b9
822 | tag: tip
824 | tag: tip
@@ -1112,6 +1114,7 b' Test setup'
1112 created new head
1114 created new head
1113 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
1115 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(C0)"`
1114 obsoleted 1 changesets
1116 obsoleted 1 changesets
1117 1 new orphan changesets
1115 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
1118 $ hg debugobsolete `getid "desc(B1)"` `getid "desc(C0)"`
1116 obsoleted 1 changesets
1119 obsoleted 1 changesets
1117
1120
@@ -1589,6 +1592,7 b' Create the cycle'
1589
1592
1590 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1593 $ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
1591 obsoleted 1 changesets
1594 obsoleted 1 changesets
1595 1 new orphan changesets
1592 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1596 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
1593 obsoleted 1 changesets
1597 obsoleted 1 changesets
1594 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
1598 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
@@ -1874,10 +1878,12 b' Diverge one of the splitted commit'
1874 $ hg up 6
1878 $ hg up 6
1875 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1879 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1876 $ hg commit --amend -m "Add only B"
1880 $ hg commit --amend -m "Add only B"
1881 1 new orphan changesets
1877
1882
1878 $ hg up 6 --hidden
1883 $ hg up 6 --hidden
1879 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1884 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1880 $ hg commit --amend -m "Add B only"
1885 $ hg commit --amend -m "Add B only"
1886 4 new content-divergent changesets
1881
1887
1882 $ hg log -G
1888 $ hg log -G
1883 @ changeset: 9:0b997eb7ceee
1889 @ changeset: 9:0b997eb7ceee
@@ -272,6 +272,7 b' setup'
272 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
272 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
273 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
273 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
274 obsoleted 1 changesets
274 obsoleted 1 changesets
275 1 new orphan changesets
275 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
276 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
276 obsoleted 1 changesets
277 obsoleted 1 changesets
277 $ hg up 'desc("ROOT")'
278 $ hg up 'desc("ROOT")'
@@ -601,6 +602,7 b' setup'
601 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
602 $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`
602 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
603 $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`
603 obsoleted 1 changesets
604 obsoleted 1 changesets
605 1 new orphan changesets
604 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
606 $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`
605 obsoleted 1 changesets
607 obsoleted 1 changesets
606
608
@@ -770,8 +772,10 b' setup'
770 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
772 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split
771 obsoleted 1 changesets
773 obsoleted 1 changesets
772 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
774 $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent
775 3 new content-divergent changesets
773 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
776 $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0
774 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
777 $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`
778 1 new content-divergent changesets
775 $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
779 $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`
776 obsoleted 1 changesets
780 obsoleted 1 changesets
777 $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
781 $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`
@@ -952,6 +956,7 b' Actual testing'
952 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
956 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
953 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
957 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
954 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg
958 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg
959 3 new content-divergent changesets
955 ### Backup markers ###
960 ### Backup markers ###
956 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
961 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
957 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
962 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -1121,6 +1126,7 b' Bundle multiple revisions'
1121 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1126 b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1122 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1127 c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1123 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg
1128 # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg
1129 3 new content-divergent changesets
1124 ### Backup markers ###
1130 ### Backup markers ###
1125 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1131 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1126 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
1132 27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -71,6 +71,7 b' marker to obsolete him)'
71 adding manifests
71 adding manifests
72 adding file changes
72 adding file changes
73 added 1 changesets with 0 changes to 1 files (+1 heads)
73 added 1 changesets with 0 changes to 1 files (+1 heads)
74 1 new phase-divergent changesets
74 new changesets f89bcc95eba5
75 new changesets f89bcc95eba5
75 (run 'hg heads' to see heads, 'hg merge' to merge)
76 (run 'hg heads' to see heads, 'hg merge' to merge)
76
77
@@ -276,6 +276,7 b' Bob pulls from Alice and rewrites them'
276 $ hg up 'desc("c_A")'
276 $ hg up 'desc("c_A")'
277 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
277 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
278 $ hg commit --amend -m 'c_A1'
278 $ hg commit --amend -m 'c_A1'
279 1 new orphan changesets
279 $ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with the rebase
280 $ hg rebase -r 'desc("c_B0")' -d . # no easy way to rewrite the message with the rebase
280 rebasing 2:ef908e42ce65 "c_B0"
281 rebasing 2:ef908e42ce65 "c_B0"
281 $ hg up
282 $ hg up
@@ -323,6 +324,7 b' Celeste pulls from Bob and rewrites them'
323 $ hg up 'desc("c_A")'
324 $ hg up 'desc("c_A")'
324 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
325 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
325 $ hg commit --amend -m 'c_A2'
326 $ hg commit --amend -m 'c_A2'
327 1 new orphan changesets
326 $ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with the rebase
328 $ hg rebase -r 'desc("c_B1")' -d . # no easy way to rewrite the message with the rebase
327 rebasing 2:956063ac4557 "c_B1"
329 rebasing 2:956063ac4557 "c_B1"
328 $ hg up
330 $ hg up
@@ -61,6 +61,7 b' A_1 have two direct and divergent succes'
61 $ hg debugobsolete `getid A_0` `getid A_1`
61 $ hg debugobsolete `getid A_0` `getid A_1`
62 obsoleted 1 changesets
62 obsoleted 1 changesets
63 $ hg debugobsolete `getid A_0` `getid A_2`
63 $ hg debugobsolete `getid A_0` `getid A_2`
64 2 new content-divergent changesets
64 $ hg log -G --hidden
65 $ hg log -G --hidden
65 * 3:392fd25390da A_2
66 * 3:392fd25390da A_2
66 |
67 |
@@ -120,6 +121,7 b' indirect divergence with known changeset'
120 $ hg debugobsolete `getid A_0` `getid A_1`
121 $ hg debugobsolete `getid A_0` `getid A_1`
121 obsoleted 1 changesets
122 obsoleted 1 changesets
122 $ hg debugobsolete `getid A_0` `getid A_2`
123 $ hg debugobsolete `getid A_0` `getid A_2`
124 2 new content-divergent changesets
123 $ mkcommit A_3
125 $ mkcommit A_3
124 created new head
126 created new head
125 $ hg debugobsolete `getid A_2` `getid A_3`
127 $ hg debugobsolete `getid A_2` `getid A_3`
@@ -180,6 +182,7 b' indirect divergence with known changeset'
180 obsoleted 1 changesets
182 obsoleted 1 changesets
181 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
183 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
182 $ hg debugobsolete `getid A_0` `getid A_2`
184 $ hg debugobsolete `getid A_0` `getid A_2`
185 2 new content-divergent changesets
183 $ hg log -G --hidden
186 $ hg log -G --hidden
184 * 3:392fd25390da A_2
187 * 3:392fd25390da A_2
185 |
188 |
@@ -250,6 +253,7 b' divergence that converge again is not di'
250 $ hg debugobsolete `getid A_0` `getid A_1`
253 $ hg debugobsolete `getid A_0` `getid A_1`
251 obsoleted 1 changesets
254 obsoleted 1 changesets
252 $ hg debugobsolete `getid A_0` `getid A_2`
255 $ hg debugobsolete `getid A_0` `getid A_2`
256 2 new content-divergent changesets
253 $ mkcommit A_3
257 $ mkcommit A_3
254 created new head
258 created new head
255 $ hg debugobsolete `getid A_1` `getid A_3`
259 $ hg debugobsolete `getid A_1` `getid A_3`
@@ -430,6 +434,7 b' Check more complex obsolescence graft (w'
430 created new head
434 created new head
431 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
435 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
432 $ hg debugobsolete `getid A_5` `getid A_9`
436 $ hg debugobsolete `getid A_5` `getid A_9`
437 4 new content-divergent changesets
433 $ hg log -G --hidden
438 $ hg log -G --hidden
434 * 10:bed64f5d2f5a A_9
439 * 10:bed64f5d2f5a A_9
435 |
440 |
@@ -670,6 +675,7 b' Use scmutil.cleanupnodes API to create d'
670
675
671 $ rm .hg/localtags
676 $ rm .hg/localtags
672 $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
677 $ hg cleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
678 2 new content-divergent changesets
673 $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
679 $ hg log -G -T '{rev}:{node|short} {desc} {instabilities}' -r 'sort(all(), topo)'
674 @ 5:1a2a9b5b0030 B2 content-divergent
680 @ 5:1a2a9b5b0030 B2 content-divergent
675 |
681 |
@@ -208,6 +208,7 b' check that various commands work well wi'
208 Check that public changeset are not accounted as obsolete:
208 Check that public changeset are not accounted as obsolete:
209
209
210 $ hg --hidden phase --public 2
210 $ hg --hidden phase --public 2
211 1 new phase-divergent changesets
211 $ hg log -G
212 $ hg log -G
212 @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
213 @ 5:5601fb93a350 (draft phase-divergent) [tip ] add new_3_c
213 |
214 |
@@ -519,6 +520,7 b' detect outgoing obsolete and unstable'
519 $ mkcommit original_e
520 $ mkcommit original_e
520 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
521 $ hg debugobsolete --record-parents `getid original_d` -d '0 0'
521 obsoleted 1 changesets
522 obsoleted 1 changesets
523 1 new orphan changesets
522 $ hg debugobsolete | grep `getid original_d`
524 $ hg debugobsolete | grep `getid original_d`
523 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
525 94b33453f93bdb8d457ef9b770851a618bf413e1 0 {6f96419950729f3671185b847352890f074f7557} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
524 $ hg log -r 'obsolete()'
526 $ hg log -r 'obsolete()'
@@ -583,6 +585,7 b" Don't try to push extinct changeset"
583 adding file changes
585 adding file changes
584 added 6 changesets with 6 changes to 6 files (+1 heads)
586 added 6 changesets with 6 changes to 6 files (+1 heads)
585 7 new obsolescence markers
587 7 new obsolescence markers
588 1 new orphan changesets
586
589
587 no warning displayed
590 no warning displayed
588
591
@@ -918,7 +921,9 b' Several troubles on the same changeset ('
918
921
919 $ hg debugobsolete `getid obsolete_e`
922 $ hg debugobsolete `getid obsolete_e`
920 obsoleted 1 changesets
923 obsoleted 1 changesets
924 2 new orphan changesets
921 $ hg debugobsolete `getid original_c` `getid babar`
925 $ hg debugobsolete `getid original_c` `getid babar`
926 1 new phase-divergent changesets
922 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()'
927 $ hg log --config ui.logtemplate= -r 'phasedivergent() and orphan()'
923 changeset: 7:50c51b361e60
928 changeset: 7:50c51b361e60
924 user: test
929 user: test
@@ -1293,6 +1298,7 b' Test heads computation on pending index '
1293 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1298 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1294 $ echo aa > a
1299 $ echo aa > a
1295 $ hg amendtransient
1300 $ hg amendtransient
1301 1 new orphan changesets
1296 [1, 2]
1302 [1, 2]
1297
1303
1298 Test cache consistency for the visible filter
1304 Test cache consistency for the visible filter
@@ -61,6 +61,7 b' Test setup'
61 created new head
61 created new head
62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
63 obsoleted 1 changesets
63 obsoleted 1 changesets
64 1 new orphan changesets
64 $ hg log -G --hidden
65 $ hg log -G --hidden
65 @ f6082bc4ffef (draft): A1
66 @ f6082bc4ffef (draft): A1
66 |
67 |
@@ -61,6 +61,7 b' Test setup'
61 created new head
61 created new head
62 $ hg debugobsolete --record-parents `getid "desc(A0)"`
62 $ hg debugobsolete --record-parents `getid "desc(A0)"`
63 obsoleted 1 changesets
63 obsoleted 1 changesets
64 1 new orphan changesets
64 $ hg log -G --hidden
65 $ hg log -G --hidden
65 @ 0f88766e02d6 (draft): C0
66 @ 0f88766e02d6 (draft): C0
66 |
67 |
@@ -61,6 +61,7 b' Test setup'
61 created new head
61 created new head
62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
63 obsoleted 1 changesets
63 obsoleted 1 changesets
64 1 new orphan changesets
64 $ hg debugobsolete --record-parents `getid "desc(B0)"`
65 $ hg debugobsolete --record-parents `getid "desc(B0)"`
65 obsoleted 1 changesets
66 obsoleted 1 changesets
66 $ hg log -G --hidden
67 $ hg log -G --hidden
@@ -61,6 +61,7 b' Test setup'
61 created new head
61 created new head
62 $ hg debugobsolete --record-parents `getid "desc(A0)"`
62 $ hg debugobsolete --record-parents `getid "desc(A0)"`
63 obsoleted 1 changesets
63 obsoleted 1 changesets
64 1 new orphan changesets
64 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
65 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
65 obsoleted 1 changesets
66 obsoleted 1 changesets
66 $ hg log -G --hidden
67 $ hg log -G --hidden
@@ -62,6 +62,7 b' Test setup'
62 created new head
62 created new head
63 $ hg debugobsolete --record-parents `getid "desc(A0)"`
63 $ hg debugobsolete --record-parents `getid "desc(A0)"`
64 obsoleted 1 changesets
64 obsoleted 1 changesets
65 1 new orphan changesets
65 $ hg debugobsolete --record-parents `getid "desc(B0)"`
66 $ hg debugobsolete --record-parents `getid "desc(B0)"`
66 obsoleted 1 changesets
67 obsoleted 1 changesets
67 $ hg log -G --hidden
68 $ hg log -G --hidden
@@ -65,6 +65,7 b' Test setup'
65 created new head
65 created new head
66 $ hg debugobsolete --record-parents `getid "desc(A0)"`
66 $ hg debugobsolete --record-parents `getid "desc(A0)"`
67 obsoleted 1 changesets
67 obsoleted 1 changesets
68 2 new orphan changesets
68 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
69 $ hg debugobsolete `getid "desc(B0)"` `getid "desc(B1)"`
69 obsoleted 1 changesets
70 obsoleted 1 changesets
70 $ hg debugobsolete --record-parents `getid "desc(C0)"`
71 $ hg debugobsolete --record-parents `getid "desc(C0)"`
@@ -68,6 +68,7 b' Test setup'
68 created new head
68 created new head
69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
70 obsoleted 1 changesets
70 obsoleted 1 changesets
71 1 new orphan changesets
71 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
72 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
72 obsoleted 1 changesets
73 obsoleted 1 changesets
73 $ hg debugobsolete --record-parents `getid "desc(B1)"`
74 $ hg debugobsolete --record-parents `getid "desc(B1)"`
@@ -61,6 +61,7 b' Test setup'
61 $ mkcommit B1
61 $ mkcommit B1
62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
62 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
63 obsoleted 1 changesets
63 obsoleted 1 changesets
64 1 new orphan changesets
64 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
65 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
65 obsoleted 1 changesets
66 obsoleted 1 changesets
66 $ hg log -G --hidden
67 $ hg log -G --hidden
@@ -64,6 +64,7 b' Test setup'
64 $ mkcommit A1
64 $ mkcommit A1
65 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
65 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
66 obsoleted 1 changesets
66 obsoleted 1 changesets
67 1 new orphan changesets
67 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
68 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
68 obsoleted 1 changesets
69 obsoleted 1 changesets
69 $ hg log -G --hidden
70 $ hg log -G --hidden
@@ -70,6 +70,7 b' Test setup'
70 $ mkcommit B1
70 $ mkcommit B1
71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
72 obsoleted 1 changesets
72 obsoleted 1 changesets
73 1 new orphan changesets
73 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
74 obsoleted 1 changesets
75 obsoleted 1 changesets
75 $ hg log -G --hidden
76 $ hg log -G --hidden
@@ -70,6 +70,7 b' Test setup'
70 created new head
70 created new head
71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
71 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
72 obsoleted 1 changesets
72 obsoleted 1 changesets
73 1 new orphan changesets
73 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
74 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
74 obsoleted 1 changesets
75 obsoleted 1 changesets
75 $ hg log -G --hidden
76 $ hg log -G --hidden
@@ -65,6 +65,7 b' Test setup'
65 created new head
65 created new head
66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
66 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
67 obsoleted 1 changesets
67 obsoleted 1 changesets
68 1 new orphan changesets
68 $ hg debugobsolete --record-parents `getid "desc(B0)"`
69 $ hg debugobsolete --record-parents `getid "desc(B0)"`
69 obsoleted 1 changesets
70 obsoleted 1 changesets
70 $ hg up 0
71 $ hg up 0
@@ -68,6 +68,7 b' Test setup'
68 created new head
68 created new head
69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
69 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
70 obsoleted 1 changesets
70 obsoleted 1 changesets
71 1 new orphan changesets
71 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
72 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
72 obsoleted 1 changesets
73 obsoleted 1 changesets
73 $ hg log -G --hidden
74 $ hg log -G --hidden
@@ -84,6 +84,7 b' Test setup'
84 $ mkcommit B1
84 $ mkcommit B1
85 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
85 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
86 obsoleted 1 changesets
86 obsoleted 1 changesets
87 1 new orphan changesets
87 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
88 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
88 obsoleted 1 changesets
89 obsoleted 1 changesets
89 $ hg log -G --hidden
90 $ hg log -G --hidden
@@ -73,6 +73,7 b' Test setup'
73 created new head
73 created new head
74 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
74 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
75 obsoleted 1 changesets
75 obsoleted 1 changesets
76 1 new orphan changesets
76 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
77 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
77 obsoleted 1 changesets
78 obsoleted 1 changesets
78 $ hg log -G --hidden
79 $ hg log -G --hidden
@@ -107,5 +108,6 b' Actual testing'
107 added 1 changesets with 1 changes to 1 files
108 added 1 changesets with 1 changes to 1 files
108 1 new obsolescence markers
109 1 new obsolescence markers
109 obsoleted 1 changesets
110 obsoleted 1 changesets
111 1 new orphan changesets
110
112
111 $ cd ../..
113 $ cd ../..
@@ -1707,6 +1707,7 b' racing commit push a new head obsoleting'
1707 added 1 changesets with 1 changes to 1 files (+1 heads)
1707 added 1 changesets with 1 changes to 1 files (+1 heads)
1708 1 new obsolescence markers
1708 1 new obsolescence markers
1709 obsoleted 1 changesets
1709 obsoleted 1 changesets
1710 1 new orphan changesets
1710 new changesets 720c5163ecf6
1711 new changesets 720c5163ecf6
1711 (run 'hg heads .' to see heads, 'hg merge' to merge)
1712 (run 'hg heads .' to see heads, 'hg merge' to merge)
1712 $ hg -R ./client-other pull
1713 $ hg -R ./client-other pull
@@ -1718,6 +1719,7 b' racing commit push a new head obsoleting'
1718 added 1 changesets with 1 changes to 1 files (+1 heads)
1719 added 1 changesets with 1 changes to 1 files (+1 heads)
1719 1 new obsolescence markers
1720 1 new obsolescence markers
1720 obsoleted 1 changesets
1721 obsoleted 1 changesets
1722 1 new orphan changesets
1721 new changesets 720c5163ecf6
1723 new changesets 720c5163ecf6
1722 (run 'hg heads .' to see heads, 'hg merge' to merge)
1724 (run 'hg heads .' to see heads, 'hg merge' to merge)
1723 $ hg -R ./client-racy pull
1725 $ hg -R ./client-racy pull
@@ -1727,6 +1729,7 b' racing commit push a new head obsoleting'
1727 adding manifests
1729 adding manifests
1728 adding file changes
1730 adding file changes
1729 added 1 changesets with 0 changes to 0 files
1731 added 1 changesets with 0 changes to 0 files
1732 1 new orphan changesets
1730 new changesets a98a47d8b85b
1733 new changesets a98a47d8b85b
1731 (run 'hg update' to get a working copy)
1734 (run 'hg update' to get a working copy)
1732
1735
@@ -1792,6 +1795,7 b' Creating changesets and markers'
1792 $ hg -R client-other/ branch --force default
1795 $ hg -R client-other/ branch --force default
1793 marked working directory as branch default
1796 marked working directory as branch default
1794 $ hg -R client-other/ commit -m "C-W"
1797 $ hg -R client-other/ commit -m "C-W"
1798 1 new orphan changesets
1795 created new head
1799 created new head
1796 $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'`
1800 $ ID_V=`hg -R client-other log -T '{node}\n' -r 'desc("C-V")'`
1797 $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'`
1801 $ ID_W=`hg -R client-other log -T '{node}\n' -r 'desc("C-W")'`
@@ -1818,6 +1822,7 b' Pushing'
1818 remote: added 1 changesets with 0 changes to 1 files (+1 heads)
1822 remote: added 1 changesets with 0 changes to 1 files (+1 heads)
1819 remote: 1 new obsolescence markers
1823 remote: 1 new obsolescence markers
1820 remote: obsoleted 1 changesets
1824 remote: obsoleted 1 changesets
1825 remote: 1 new orphan changesets
1821
1826
1822 $ release $TESTTMP/watchfile
1827 $ release $TESTTMP/watchfile
1823
1828
@@ -420,6 +420,7 b' Resolve instability:'
420 > \| # amend: I -> I2
420 > \| # amend: I -> I2
421 > A
421 > A
422 > EOF
422 > EOF
423 6 new orphan changesets
423 rebasing 16:5c432343bf59 "J" (J tip)
424 rebasing 16:5c432343bf59 "J" (J tip)
424 rebasing 3:26805aba1e60 "C" (C)
425 rebasing 3:26805aba1e60 "C" (C)
425 rebasing 6:f585351a92f8 "D" (D)
426 rebasing 6:f585351a92f8 "D" (D)
@@ -182,6 +182,7 b' More complex case where part of the reba'
182
182
183 $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
183 $ hg rebase --rev 'desc(D)' --dest 'desc(H)'
184 rebasing 9:08483444fef9 "D"
184 rebasing 9:08483444fef9 "D"
185 1 new orphan changesets
185 $ hg debugobsolete
186 $ hg debugobsolete
186 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
187 42ccdea3bb16d28e1848c95fe2e44c000f3f21b1 0 {cd010b8cd998f3981a5a8115f94f8da4ab506089} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'rebase', 'user': 'test'}
187 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
188 5fddd98957c8a54a4d436dfe1da9d87f21a1b97b 5ae4c968c6aca831df823664e706c9d4aa34473d 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'rebase', 'user': 'test'}
@@ -460,6 +461,7 b' Test that rewriting leaving instability '
460 9:cf44d2f5a9f4 D (no-eol)
461 9:cf44d2f5a9f4 D (no-eol)
461 $ hg rebase -r 8
462 $ hg rebase -r 8
462 rebasing 8:e273c5e7d2d2 "C"
463 rebasing 8:e273c5e7d2d2 "C"
464 1 new orphan changesets
463 $ hg log -G
465 $ hg log -G
464 o 11:0d8f238b634c C
466 o 11:0d8f238b634c C
465 |
467 |
@@ -582,6 +584,7 b' test on rebase dropping a merge'
582 rebasing 3:32af7686d403 "D"
584 rebasing 3:32af7686d403 "D"
583 rebasing 7:02de42196ebe "H"
585 rebasing 7:02de42196ebe "H"
584 rebasing 9:4bde274eefcf "I" (tip)
586 rebasing 9:4bde274eefcf "I" (tip)
587 1 new orphan changesets
585 $ hg log -G
588 $ hg log -G
586 @ 12:acd174b7ab39 I
589 @ 12:acd174b7ab39 I
587 |
590 |
@@ -616,12 +619,14 b' Test hidden changesets in the rebase set'
616 $ echo J > J
619 $ echo J > J
617 $ hg add J
620 $ hg add J
618 $ hg commit -m J
621 $ hg commit -m J
622 1 new orphan changesets
619 $ hg debugobsolete `hg log --rev . -T '{node}'`
623 $ hg debugobsolete `hg log --rev . -T '{node}'`
620 obsoleted 1 changesets
624 obsoleted 1 changesets
621
625
622 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
626 $ hg rebase --rev .~1::. --dest 'max(desc(D))' --traceback --config experimental.rebaseskipobsolete=off
623 rebasing 9:4bde274eefcf "I"
627 rebasing 9:4bde274eefcf "I"
624 rebasing 13:06edfc82198f "J" (tip)
628 rebasing 13:06edfc82198f "J" (tip)
629 2 new content-divergent changesets
625 $ hg log -G
630 $ hg log -G
626 @ 15:5ae8a643467b J
631 @ 15:5ae8a643467b J
627 |
632 |
@@ -656,6 +661,7 b' Test hidden changesets in the rebase set'
656 $ echo "K" > K
661 $ echo "K" > K
657 $ hg add K
662 $ hg add K
658 $ hg commit --amend -m "K"
663 $ hg commit --amend -m "K"
664 1 new orphan changesets
659 $ echo "L" > L
665 $ echo "L" > L
660 $ hg add L
666 $ hg add L
661 $ hg commit -m "L"
667 $ hg commit -m "L"
@@ -664,6 +670,7 b' Test hidden changesets in the rebase set'
664 $ echo "M" > M
670 $ echo "M" > M
665 $ hg add M
671 $ hg add M
666 $ hg commit --amend -m "M"
672 $ hg commit --amend -m "M"
673 1 new orphan changesets
667 $ hg log -G
674 $ hg log -G
668 @ 18:bfaedf8eb73b M
675 @ 18:bfaedf8eb73b M
669 |
676 |
@@ -702,6 +709,7 b' Test hidden changesets in the rebase set'
702 $ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True
709 $ hg rebase -s 14 -d 17 --config experimental.rebaseskipobsolete=True
703 note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K"
710 note: not rebasing 14:9ad579b4a5de "I", already in destination as 16:fc37a630c901 "K"
704 rebasing 15:5ae8a643467b "J"
711 rebasing 15:5ae8a643467b "J"
712 1 new orphan changesets
705
713
706 $ cd ..
714 $ cd ..
707
715
@@ -732,6 +740,7 b' setup'
732 $ echo C > C
740 $ echo C > C
733 $ hg add C
741 $ hg add C
734 $ hg commit -m C
742 $ hg commit -m C
743 1 new orphan changesets
735 $ hg log -G
744 $ hg log -G
736 @ 4:212cb178bcbb C
745 @ 4:212cb178bcbb C
737 |
746 |
@@ -756,6 +765,7 b' Even when the chain include missing node'
756 $ echo D > D
765 $ echo D > D
757 $ hg add D
766 $ hg add D
758 $ hg commit -m D
767 $ hg commit -m D
768 1 new orphan changesets
759 $ hg --hidden strip -r 'desc(B1)'
769 $ hg --hidden strip -r 'desc(B1)'
760 saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
770 saved backup bundle to $TESTTMP/obsskip/.hg/strip-backup/86f6414ccda7-b1c452ee-backup.hg
761 $ hg log -G
771 $ hg log -G
@@ -796,6 +806,7 b' Even when the chain include missing node'
796
806
797 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
807 $ hg debugobsolete `hg log -r 7 -T '{node}\n'` --config experimental.evolution=true
798 obsoleted 1 changesets
808 obsoleted 1 changesets
809 1 new orphan changesets
799 $ hg rebase -d 6 -r "4::"
810 $ hg rebase -d 6 -r "4::"
800 rebasing 4:ff2c4d47b71d "C"
811 rebasing 4:ff2c4d47b71d "C"
801 note: not rebasing 7:360bbaa7d3ce "O", it has no successor
812 note: not rebasing 7:360bbaa7d3ce "O", it has no successor
@@ -871,6 +882,7 b' If a rebase is going to create divergenc'
871 $ echo "bar" > foo
882 $ echo "bar" > foo
872 $ hg add foo
883 $ hg add foo
873 $ hg commit -m "bar foo"
884 $ hg commit -m "bar foo"
885 1 new orphan changesets
874 $ hg log -G
886 $ hg log -G
875 @ 14:73568ab6879d bar foo
887 @ 14:73568ab6879d bar foo
876 |
888 |
@@ -922,6 +934,7 b' With experimental.evolution.allowdiverge'
922 $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
934 $ hg rebase -s 10 -d 12 --config experimental.evolution.allowdivergence=True
923 rebasing 10:121d9e3bc4c6 "P"
935 rebasing 10:121d9e3bc4c6 "P"
924 rebasing 14:73568ab6879d "bar foo" (tip)
936 rebasing 14:73568ab6879d "bar foo" (tip)
937 2 new content-divergent changesets
925 $ hg summary
938 $ hg summary
926 parent: 16:61bd55f69bc4 tip
939 parent: 16:61bd55f69bc4 tip
927 bar foo
940 bar foo
@@ -961,6 +974,7 b' Create the changes that we will rebase'
961 $ hg commit -m "dummy change"
974 $ hg commit -m "dummy change"
962 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true
975 $ hg debugobsolete `hg log -r ".^" -T '{node}'` `hg log -r 18 -T '{node}'` --config experimental.evolution=true
963 obsoleted 1 changesets
976 obsoleted 1 changesets
977 1 new orphan changesets
964
978
965 $ hg log -G -r 16::
979 $ hg log -G -r 16::
966 @ 21:7bdc8a87673d dummy change
980 @ 21:7bdc8a87673d dummy change
@@ -1020,6 +1034,7 b' obsolete changeset which successor is in'
1020 > \|
1034 > \|
1021 > a
1035 > a
1022 > EOF
1036 > EOF
1037 1 new orphan changesets
1023 $ hg log -G -r 'a'::
1038 $ hg log -G -r 'a'::
1024 * 7:1143e9adc121 f
1039 * 7:1143e9adc121 f
1025 |
1040 |
@@ -1087,6 +1102,8 b' By allowing divergence, we can perform t'
1087 rebasing 3:a82ac2b38757 "c" (c)
1102 rebasing 3:a82ac2b38757 "c" (c)
1088 rebasing 4:76be324c128b "d" (d)
1103 rebasing 4:76be324c128b "d" (d)
1089 rebasing 7:1143e9adc121 "f" (f tip)
1104 rebasing 7:1143e9adc121 "f" (f tip)
1105 1 new orphan changesets
1106 2 new content-divergent changesets
1090 $ hg log -G -r 'a':: -T instabilities
1107 $ hg log -G -r 'a':: -T instabilities
1091 o 10:e1744ea07510 f
1108 o 10:e1744ea07510 f
1092 |
1109 |
@@ -1118,6 +1135,8 b' By allowing divergence, we can perform t'
1118 rebasing 3:a82ac2b38757 "c" (c)
1135 rebasing 3:a82ac2b38757 "c" (c)
1119 rebasing 4:76be324c128b "d" (d)
1136 rebasing 4:76be324c128b "d" (d)
1120 rebasing 7:1143e9adc121 "f" (f tip)
1137 rebasing 7:1143e9adc121 "f" (f tip)
1138 1 new orphan changesets
1139 2 new content-divergent changesets
1121
1140
1122 $ hg strip -r 0:
1141 $ hg strip -r 0:
1123
1142
@@ -1136,6 +1155,7 b' Similar test on a more complex graph'
1136 > \|
1155 > \|
1137 > a
1156 > a
1138 > EOF
1157 > EOF
1158 1 new orphan changesets
1139 $ hg log -G -r 'a':
1159 $ hg log -G -r 'a':
1140 * 8:2876ce66c6eb g
1160 * 8:2876ce66c6eb g
1141 |
1161 |
@@ -1206,6 +1226,7 b' Rebase merge where successor of one pare'
1206 > \|/
1226 > \|/
1207 > A
1227 > A
1208 > EOF
1228 > EOF
1229 1 new orphan changesets
1209
1230
1210 $ hg rebase -d B -s D
1231 $ hg rebase -d B -s D
1211 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
1232 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
@@ -1237,6 +1258,7 b' Rebase merge where successor of other pa'
1237 > \|/
1258 > \|/
1238 > A
1259 > A
1239 > EOF
1260 > EOF
1261 1 new orphan changesets
1240
1262
1241 $ hg rebase -d B -s E
1263 $ hg rebase -d B -s E
1242 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
1264 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
@@ -1268,6 +1290,7 b' Rebase merge where successor of one pare'
1268 > \|/
1290 > \|/
1269 > A
1291 > A
1270 > EOF
1292 > EOF
1293 1 new orphan changesets
1271
1294
1272 $ hg rebase -d C -s D
1295 $ hg rebase -d C -s D
1273 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
1296 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
@@ -1302,6 +1325,7 b' Rebase merge where successor of other pa'
1302 > \|/
1325 > \|/
1303 > A
1326 > A
1304 > EOF
1327 > EOF
1328 1 new orphan changesets
1305
1329
1306 $ hg rebase -d C -s E
1330 $ hg rebase -d C -s E
1307 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
1331 note: not rebasing 3:7fb047a69f22 "E" (E), already in destination as 1:112478962961 "B" (B)
@@ -1335,6 +1359,7 b' Rebase merge where successor of one pare'
1335 > \|/
1359 > \|/
1336 > A
1360 > A
1337 > EOF
1361 > EOF
1362 1 new orphan changesets
1338
1363
1339 $ hg rebase -d C -b F
1364 $ hg rebase -d C -b F
1340 rebasing 2:b18e25de2cf5 "D" (D)
1365 rebasing 2:b18e25de2cf5 "D" (D)
@@ -1370,6 +1395,7 b' Rebase merge where successor of other pa'
1370 > \|/
1395 > \|/
1371 > A
1396 > A
1372 > EOF
1397 > EOF
1398 1 new orphan changesets
1373
1399
1374 $ hg rebase -d C -b F
1400 $ hg rebase -d C -b F
1375 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
1401 note: not rebasing 2:b18e25de2cf5 "D" (D), already in destination as 1:112478962961 "B" (B)
@@ -1405,6 +1431,7 b' Rebase merge where both parents have suc'
1405 > | |
1431 > | |
1406 > X Y
1432 > X Y
1407 > EOS
1433 > EOS
1434 1 new orphan changesets
1408 $ hg rebase -r A+B+E -d F
1435 $ hg rebase -r A+B+E -d F
1409 note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C)
1436 note: not rebasing 4:a3d17304151f "A" (A), already in destination as 0:96cc3511f894 "C" (C)
1410 note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D)
1437 note: not rebasing 5:b23a2cc00842 "B" (B), already in destination as 1:058c1e1fb10a "D" (D)
@@ -1423,6 +1450,7 b' parent moves as requested.'
1423 > /| | # replace: A -> C
1450 > /| | # replace: A -> C
1424 > A B C # D/D = D
1451 > A B C # D/D = D
1425 > EOS
1452 > EOS
1453 1 new orphan changesets
1426 $ hg rebase -r A+B+D -d Z
1454 $ hg rebase -r A+B+D -d Z
1427 note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C)
1455 note: not rebasing 0:426bada5c675 "A" (A), already in destination as 2:96cc3511f894 "C" (C)
1428 rebasing 1:fc2b737bb2e5 "B" (B)
1456 rebasing 1:fc2b737bb2e5 "B" (B)
@@ -1453,6 +1481,7 b' parent moves as requested.'
1453 > /| | # replace: B -> C
1481 > /| | # replace: B -> C
1454 > A B C # D/D = D
1482 > A B C # D/D = D
1455 > EOS
1483 > EOS
1484 1 new orphan changesets
1456 $ hg rebase -r B+A+D -d Z
1485 $ hg rebase -r B+A+D -d Z
1457 rebasing 0:426bada5c675 "A" (A)
1486 rebasing 0:426bada5c675 "A" (A)
1458 note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C)
1487 note: not rebasing 1:fc2b737bb2e5 "B" (B), already in destination as 2:96cc3511f894 "C" (C)
@@ -1530,6 +1559,7 b' parent gets moved:'
1530 $ hg rebase -r B+D1 -d E
1559 $ hg rebase -r B+D1 -d E
1531 rebasing 1:112478962961 "B" (B)
1560 rebasing 1:112478962961 "B" (B)
1532 note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2)
1561 note: not rebasing 5:15ecf15e0114 "D1" (book D1 tip), already in destination as 2:0807738e0be9 "D2" (D2)
1562 1 new orphan changesets
1533 $ hg log -G -T '{desc} {bookmarks}'
1563 $ hg log -G -T '{desc} {bookmarks}'
1534 @ B book
1564 @ B book
1535 |
1565 |
@@ -1561,6 +1591,7 b' Rebasing a merge with one of its parent '
1561 > |/
1591 > |/
1562 > A
1592 > A
1563 > EOS
1593 > EOS
1594 1 new orphan changesets
1564
1595
1565 $ eval `hg tags -T '{tag}={node}\n'`
1596 $ eval `hg tags -T '{tag}={node}\n'`
1566 $ rm .hg/localtags
1597 $ rm .hg/localtags
@@ -1636,6 +1636,8 b' Test obsstore related revsets'
1636 > \|/ | # amend: F -> G
1636 > \|/ | # amend: F -> G
1637 > A A Z # amend: A -> Z
1637 > A A Z # amend: A -> Z
1638 > EOS
1638 > EOS
1639 3 new orphan changesets
1640 3 new content-divergent changesets
1639
1641
1640 $ hg log -r 'successors(Z)' -T '{desc}\n'
1642 $ hg log -r 'successors(Z)' -T '{desc}\n'
1641 Z
1643 Z
@@ -242,6 +242,7 b' Obsolescence information appears in labe'
242 > EOF
242 > EOF
243 $ hg debugobsolete `hg log -r 'desc("commit 2")' -T "{node}"`
243 $ hg debugobsolete `hg log -r 'desc("commit 2")' -T "{node}"`
244 obsoleted 1 changesets
244 obsoleted 1 changesets
245 1 new orphan changesets
245 $ hg show work --color=debug
246 $ hg show work --color=debug
246 @ [log.changeset changeset.draft changeset.unstable instability.orphan|32f3] [log.description|commit 3]
247 @ [log.changeset changeset.draft changeset.unstable instability.orphan|32f3] [log.description|commit 3]
247 x [log.changeset changeset.draft changeset.obsolete|6a75] [log.description|commit 2]
248 x [log.changeset changeset.draft changeset.obsolete|6a75] [log.description|commit 2]
@@ -417,6 +417,7 b' Split a non-head without rebase'
417 [255]
417 [255]
418 #else
418 #else
419 $ runsplit -r 1 --no-rebase >/dev/null
419 $ runsplit -r 1 --no-rebase >/dev/null
420 3 new orphan changesets
420 $ hg bookmark
421 $ hg bookmark
421 d1 2:b5c5ea414030
422 d1 2:b5c5ea414030
422 * d2 3:f4a0a8d004cc
423 * d2 3:f4a0a8d004cc
@@ -459,6 +460,7 b' Split a non-head with obsoleted descenda'
459 > |
460 > |
460 > A
461 > A
461 > EOS
462 > EOS
463 2 new orphan changesets
462 $ eval `hg tags -T '{tag}={node}\n'`
464 $ eval `hg tags -T '{tag}={node}\n'`
463 $ rm .hg/localtags
465 $ rm .hg/localtags
464 $ hg split $B --config experimental.evolution=createmarkers
466 $ hg split $B --config experimental.evolution=createmarkers
@@ -1285,6 +1285,7 b' we have reusable code here'
1285 > EOF
1285 > EOF
1286
1286
1287 $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
1287 $ hg testnodescleanup --config extensions.t=$TESTTMP/scmutilcleanup.py
1288 4 new orphan changesets
1288
1289
1289 $ rm .hg/localtags
1290 $ rm .hg/localtags
1290 $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
1291 $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
@@ -258,6 +258,7 b' Unamending in middle of a stack'
258 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
258 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
259 $ echo bar >> f
259 $ echo bar >> f
260 $ hg amend
260 $ hg amend
261 3 new orphan changesets
261 $ hg rebase -s 6 -d . -q
262 $ hg rebase -s 6 -d . -q
262
263
263 $ hg glog
264 $ hg glog
@@ -285,12 +286,14 b' Unamending in middle of a stack'
285 [255]
286 [255]
286
287
287 $ hg unamend
288 $ hg unamend
289 3 new orphan changesets
288
290
289 Trying to unamend a public changeset
291 Trying to unamend a public changeset
290
292
291 $ hg up -C 23
293 $ hg up -C 23
292 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
294 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
293 $ hg phase -r . -p
295 $ hg phase -r . -p
296 1 new phase-divergent changesets
294 $ hg unamend
297 $ hg unamend
295 abort: cannot unamend public changesets
298 abort: cannot unamend public changesets
296 (see 'hg help phases' for details)
299 (see 'hg help phases' for details)
@@ -190,6 +190,7 b' Uncommit in the middle of a stack, does '
190 $ hg bookmark
190 $ hg bookmark
191 foo 9:48e5bd7cd583
191 foo 9:48e5bd7cd583
192 $ hg uncommit
192 $ hg uncommit
193 3 new orphan changesets
193 $ hg status
194 $ hg status
194 M files
195 M files
195 A file-abc
196 A file-abc
@@ -220,6 +221,7 b' Partial uncommit in the middle, does not'
220 $ hg bookmark
221 $ hg bookmark
221 foo 9:48e5bd7cd583
222 foo 9:48e5bd7cd583
222 $ hg uncommit file-ab
223 $ hg uncommit file-ab
224 1 new orphan changesets
223 $ hg status
225 $ hg status
224 A file-ab
226 A file-ab
225
227
General Comments 0
You need to be logged in to leave comments. Login now