This is an archive of the discontinued Mercurial Phabricator instance.

Differential D92

drawdag: include files from both parents in merge commits
ClosedPublic

Authored by martinvonz on Jul 15 2017, 2:13 AM.

Details

Reviewers
quark
durin42
Group Reviewers
hg-reviewers
Commits
rHG0103e7187237: drawdag: include files from both parents in merge commits
rHGc3dd0b05b233: drawdag: include files from both parents in merge commits
Summary

Consider a graph like this:

D
|\
B C
|/
A

drawdag will add a file called A in commit A, file B in B, file C in
C. That's fine and expected. In merge commits like D, I would expect
the files and their contents to be taken from the parent commits, so
commit D in this example would have files A, B, and C. However,
drawdag will instead add the file D compared to the first
parent. Depending on whether B or C got a smaller nodeid, the contents
of D would be {A, B, D} or {A, C, D}. This patch changes it to to be
{A, B, C}.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jul 15 2017, 2:13 AM
quark accepted this revision.Jul 15 2017, 12:48 PM
quark added a subscriber: quark.

Thanks for doing this! It's a missing feature when I was writing the first version of drawdag.

I read through repo.commitctx and double checked the {files} field in changelog is correct.

quark added a comment.Jul 15 2017, 6:13 PM

I think you can self-push these so I can rebase my work on top of it. Otherwise we can defer multi-dest feature to after the freeze.

martinvonz updated this revision to Diff 183.Jul 16 2017, 12:46 AM
martinvonz added a comment.Jul 16 2017, 1:27 AM
In D92#1383, @quark wrote:

I think you can self-push these so I can rebase my work on top of it.

I don't think I've ever pushed my own patches, so I'm not comfortable doing that for these either.

Otherwise we can defer multi-dest feature to after the freeze.

I would honestly prefer that anyway. It's mostly the defineparents patch I'm concerned with, as I've said before. After having spent a day trying to understand the old code, it's clear that there are bugs in it. I'm sure your rewrite fixes most or all of them. It's still just too large for me to be comfortable accepting it.

durin42 accepted this revision.Jul 17 2017, 6:16 PM
This revision is now accepted and ready to land.Jul 17 2017, 6:16 PM
Closed by commit rHGc3dd0b05b233: drawdag: include files from both parents in merge commits (authored by martinvonz). · Explain WhyJul 18 2017, 2:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/drawdag.py (21 lines)
Mtests/test-bundle-phases.t (12 lines)
Mtests/test-drawdag.t (12 lines)
Mtests/test-rebase-base.t (32 lines)
Mtests/test-strip.t (14 lines)

Diff 279

tests/drawdag.py

def renamed(self): def renamed(self):
return None return None
def flags(self): def flags(self):
return '' return ''
class simplecommitctx(context.committablectx): class simplecommitctx(context.committablectx):
def __init__(self, repo, name, parentctxs, added=None): def __init__(self, repo, name, parentctxs, added):
opts = { opts = {
'changes': scmutil.status([], added or [], [], [], [], [], []), 'changes': scmutil.status([], list(added), [], [], [], [], []),
'date': '0 0', 'date': '0 0',
'extra': {'branch': 'default'}, 'extra': {'branch': 'default'},
} }
super(simplecommitctx, self).__init__(self, name, **opts) super(simplecommitctx, self).__init__(self, name, **opts)
self._repo = repo self._repo = repo
self._name = name self._added = added
self._parents = parentctxs self._parents = parentctxs
self._parents.sort(key=lambda c: c.node())
while len(self._parents) < 2: while len(self._parents) < 2:
self._parents.append(repo[node.nullid]) self._parents.append(repo[node.nullid])
def filectx(self, key): def filectx(self, key):
return simplefilectx(key, self._name) return simplefilectx(key, self._added[key])
def commit(self): def commit(self):
return self._repo.commitctx(self) return self._repo.commitctx(self)
def _walkgraph(edges): def _walkgraph(edges):
"""yield node, parents in topologically order""" """yield node, parents in topologically order"""
visible = set(edges.keys()) visible = set(edges.keys())
remaining = {} # {str: [str]} remaining = {} # {str: [str]}
except error.RepoLookupError: except error.RepoLookupError:
pass pass
# commit in topological order # commit in topological order
for name, parents in _walkgraph(edges): for name, parents in _walkgraph(edges):
if name in committed: if name in committed:
continue continue
pctxs = [repo[committed[n]] for n in parents] pctxs = [repo[committed[n]] for n in parents]
ctx = simplecommitctx(repo, name, pctxs, [name]) pctxs.sort(key=lambda c: c.node())
added = {}
if len(parents) > 1:
# If it's a merge, take the files and contents from the parents
for f in pctxs[1].manifest():
if f not in pctxs[0].manifest():
added[f] = pctxs[1][f].data()
else:
# If it's not a merge, add a single file
added[name] = name
ctx = simplecommitctx(repo, name, pctxs, added)
n = ctx.commit() n = ctx.commit()
committed[name] = n committed[name] = n
tagsmod.tag(repo, name, n, message=None, user=None, date=None, tagsmod.tag(repo, name, n, message=None, user=None, date=None,
local=True) local=True)
# handle special comments # handle special comments
with repo.wlock(), repo.lock(), repo.transaction('drawdag'): with repo.wlock(), repo.lock(), repo.transaction('drawdag'):
getctx = lambda x: repo.unfiltered()[committed[x.strip()]] getctx = lambda x: repo.unfiltered()[committed[x.strip()]]

tests/test-bundle-phases.t

> |/ > |/
> A > A
> EOF > EOF
$ hg phase --public C $ hg phase --public C
$ hg phase --force --secret B $ hg phase --force --secret B
$ hg log -G -T '{node|short} {desc} {phase}\n' $ hg log -G -T '{node|short} {desc} {phase}\n'
o 03ca77807e91 E draft o 03ca77807e91 E draft
| |
| o 215e7b0814e1 D secret | o 4e4f9194f9f1 D secret
|/| |/|
o | dc0947a82db8 C public o | dc0947a82db8 C public
| | | |
| o 112478962961 B secret | o 112478962961 B secret
|/ |/
o 426bada5c675 A public o 426bada5c675 A public
Restore bundle of entire repo Restore bundle of entire repo
$ hg bundle -a bundle $ hg bundle -a bundle
5 changesets found 5 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: sortdict([('Compression', 'BZ')]) Stream params: sortdict([('Compression', 'BZ')])
changegroup -- "sortdict([('version', '02'), ('nbchanges', '5'), ('targetphase', '2')])" changegroup -- "sortdict([('version', '02'), ('nbchanges', '5'), ('targetphase', '2')])"
426bada5c67598ca65036d57d9e4b64b0c1ce7a0 426bada5c67598ca65036d57d9e4b64b0c1ce7a0
112478962961147124edd43549aedd1a335e44bf 112478962961147124edd43549aedd1a335e44bf
dc0947a82db884575bb76ea10ac97b08536bfa03 dc0947a82db884575bb76ea10ac97b08536bfa03
215e7b0814e1cac8e2614e7284f2a5dc266b4323 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
03ca77807e919db8807c3749086dc36fb478cac0 03ca77807e919db8807c3749086dc36fb478cac0
phase-heads -- 'sortdict()' phase-heads -- 'sortdict()'
dc0947a82db884575bb76ea10ac97b08536bfa03 public dc0947a82db884575bb76ea10ac97b08536bfa03 public
03ca77807e919db8807c3749086dc36fb478cac0 draft 03ca77807e919db8807c3749086dc36fb478cac0 draft
$ hg strip --no-backup A $ hg strip --no-backup A
$ hg unbundle -q bundle $ hg unbundle -q bundle
$ rm bundle $ rm bundle
$ hg log -G -T '{node|short} {desc} {phase}\n' $ hg log -G -T '{node|short} {desc} {phase}\n'
o 03ca77807e91 E draft o 03ca77807e91 E draft
| |
| o 215e7b0814e1 D secret | o 4e4f9194f9f1 D secret
|/| |/|
o | dc0947a82db8 C public o | dc0947a82db8 C public
| | | |
| o 112478962961 B secret | o 112478962961 B secret
|/ |/
o 426bada5c675 A public o 426bada5c675 A public
$ hg bundle --base 'A + C' -r D bundle $ hg bundle --base 'A + C' -r D bundle
2 changesets found 2 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: sortdict([('Compression', 'BZ')]) Stream params: sortdict([('Compression', 'BZ')])
changegroup -- "sortdict([('version', '02'), ('nbchanges', '2'), ('targetphase', '2')])" changegroup -- "sortdict([('version', '02'), ('nbchanges', '2'), ('targetphase', '2')])"
112478962961147124edd43549aedd1a335e44bf 112478962961147124edd43549aedd1a335e44bf
215e7b0814e1cac8e2614e7284f2a5dc266b4323 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
phase-heads -- 'sortdict()' phase-heads -- 'sortdict()'
$ rm bundle $ rm bundle
$ hg bundle --base A -r D bundle $ hg bundle --base A -r D bundle
3 changesets found 3 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: sortdict([('Compression', 'BZ')]) Stream params: sortdict([('Compression', 'BZ')])
changegroup -- "sortdict([('version', '02'), ('nbchanges', '3'), ('targetphase', '2')])" changegroup -- "sortdict([('version', '02'), ('nbchanges', '3'), ('targetphase', '2')])"
112478962961147124edd43549aedd1a335e44bf 112478962961147124edd43549aedd1a335e44bf
dc0947a82db884575bb76ea10ac97b08536bfa03 dc0947a82db884575bb76ea10ac97b08536bfa03
215e7b0814e1cac8e2614e7284f2a5dc266b4323 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
phase-heads -- 'sortdict()' phase-heads -- 'sortdict()'
dc0947a82db884575bb76ea10ac97b08536bfa03 public dc0947a82db884575bb76ea10ac97b08536bfa03 public
$ rm bundle $ rm bundle
$ hg bundle --base 'B + C' -r 'D + E' bundle $ hg bundle --base 'B + C' -r 'D + E' bundle
2 changesets found 2 changesets found
$ hg debugbundle bundle $ hg debugbundle bundle
Stream params: sortdict([('Compression', 'BZ')]) Stream params: sortdict([('Compression', 'BZ')])
changegroup -- "sortdict([('version', '02'), ('nbchanges', '2'), ('targetphase', '2')])" changegroup -- "sortdict([('version', '02'), ('nbchanges', '2'), ('targetphase', '2')])"
215e7b0814e1cac8e2614e7284f2a5dc266b4323 4e4f9194f9f181c57f62e823e8bdfa46ab9e4ff4
03ca77807e919db8807c3749086dc36fb478cac0 03ca77807e919db8807c3749086dc36fb478cac0
phase-heads -- 'sortdict()' phase-heads -- 'sortdict()'
03ca77807e919db8807c3749086dc36fb478cac0 draft 03ca77807e919db8807c3749086dc36fb478cac0 draft
$ rm bundle $ rm bundle

tests/test-drawdag.t

| | o bar | | o bar
| |/| | |/|
| o | b | o | b
| |/ | |/
o / baz o / baz
/ /
o a o a
$ hg manifest -r a
a
$ hg manifest -r b
a
b
$ hg manifest -r bar
a
b
$ hg manifest -r foo
a
b
baz
Edges existed in repo are no-ops Edges existed in repo are no-ops
$ reinit $ reinit
$ hg debugdrawdag <<'EOS' $ hg debugdrawdag <<'EOS'
> B C C > B C C
> | | | > | | |
> A A B > A A B

tests/test-rebase-base.t

> Z | / > Z | /
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 6:5251e0cb7302 "E" (E tip) rebasing 6:54c8f00cb91c "E" (E tip)
o 6: E o 6: E
|\ |\
| o 5: C | o 5: C
| | | |
o | 4: B o | 4: B
|/ |/
o 3: Z o 3: Z
| |
> /| > /|
> Z B C # descendants(B) = B+E. With E, C will be included incorrectly > Z B C # descendants(B) = B+E. With E, C will be included incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 5:5251e0cb7302 "E" (E tip) rebasing 5:54c8f00cb91c "E" (E tip)
o 5: E o 5: E
|\ |\
| o 4: B | o 4: B
| | | |
| o 3: Z | o 3: Z
| | | |
o | 2: C o | 2: C
|/ |/
> Z B C # roots(B+E) = B. Without E, C will be missed incorrectly > Z B C # roots(B+E) = B. Without E, C will be missed incorrectly
> \|/ > \|/
> A > A
> | > |
> R > R
> EOS > EOS
rebasing 2:c1e6b162678d "B" (B) rebasing 2:c1e6b162678d "B" (B)
rebasing 3:d6003a550c2c "C" (C) rebasing 3:d6003a550c2c "C" (C)
rebasing 5:5251e0cb7302 "E" (E tip) rebasing 5:54c8f00cb91c "E" (E tip)
o 5: E o 5: E
|\ |\
| o 4: C | o 4: C
| | | |
o | 3: B o | 3: B
|/ |/
o 2: Z o 2: Z
| |
> |\ /| |\ > |\ /| |\
> F E D M N > F E D M N
> \|/| /| |\ > \|/| /| |\
> Z C B I J K L > Z C B I J K L
> \|/ |/ |/ > \|/ |/ |/
> A A A > A A A
> EOS > EOS
rebasing 2:dc0947a82db8 "C" (C) rebasing 2:dc0947a82db8 "C" (C)
rebasing 8:215e7b0814e1 "D" (D) rebasing 8:4e4f9194f9f1 "D" (D)
rebasing 9:03ca77807e91 "E" (E) rebasing 9:03ca77807e91 "E" (E)
rebasing 10:afc707c82df0 "F" (F) rebasing 10:afc707c82df0 "F" (F)
rebasing 13:018caa673317 "G" (G) rebasing 13:690dfff91e9e "G" (G)
rebasing 14:4f710fbd68cb "H" (H) rebasing 14:2893b886bb10 "H" (H)
rebasing 3:08ebfeb61bac "I" (I) rebasing 3:08ebfeb61bac "I" (I)
rebasing 4:a0a5005cec67 "J" (J) rebasing 4:a0a5005cec67 "J" (J)
rebasing 5:83780307a7e8 "K" (K) rebasing 5:83780307a7e8 "K" (K)
rebasing 6:e131637a1cb6 "L" (L) rebasing 6:e131637a1cb6 "L" (L)
rebasing 11:d6fe3d11d95d "M" (M) rebasing 11:d1f6d0c3c7e4 "M" (M)
rebasing 12:fa1e02269063 "N" (N) rebasing 12:7aaec6f81888 "N" (N)
rebasing 15:448b1a498430 "P" (P tip) rebasing 15:325bc8f1760d "P" (P tip)
o 15: P o 15: P
|\ |\
| o 14: N | o 14: N
| |\ | |\
o \ \ 13: M o \ \ 13: M
|\ \ \ |\ \ \
| | | o 12: L | | | o 12: L
| | | | | | | |
> M1 > M1
> | > |
> M0 > M0
> EOF > EOF
rebasing 4:8817fae53c94 "C0" (C0) rebasing 4:8817fae53c94 "C0" (C0)
rebasing 6:06ca5dfe3b5b "B2" (B2) rebasing 6:06ca5dfe3b5b "B2" (B2)
rebasing 7:73508237b032 "C1" (C1) rebasing 7:73508237b032 "C1" (C1)
rebasing 9:fdb955e2faed "A2" (A2) rebasing 9:fdb955e2faed "A2" (A2)
rebasing 11:1b2f368c3cb5 "A3" (A3) rebasing 11:4e449bd1a643 "A3" (A3)
rebasing 10:0a33b0519128 "B1" (B1) rebasing 10:0a33b0519128 "B1" (B1)
rebasing 12:bd6a37b5b67a "B3" (B3 tip) rebasing 12:209327807c3a "B3" (B3 tip)
o 12: B3 o 12: B3
|\ |\
| o 11: B1 | o 11: B1
| | | |
| | o 10: A3 | | o 10: A3
| | |\ | | |\
| +---o 9: A2 | +---o 9: A2
| | | | | |
Multiple roots. One root is not an ancestor of dest: Multiple roots. One root is not an ancestor of dest:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> Z B D > Z B D
> \|\| > \|\|
> A C > A C
> EOF > EOF
nothing to rebase from 86d01f49c0d9+b70f76719894 to 262e37e34f63 nothing to rebase from f675d5a1c6a4+b70f76719894 to 262e37e34f63
[1] [1]
Multiple roots. One root is not an ancestor of dest. Select using a merge: Multiple roots. One root is not an ancestor of dest. Select using a merge:
$ rebasewithdag -b E -d Z <<'EOF' $ rebasewithdag -b E -d Z <<'EOF'
> E > E
> |\ > |\
> Z B D > Z B D
> \|\| > \|\|
> A C > A C
> EOF > EOF
rebasing 2:86d01f49c0d9 "B" (B) rebasing 2:f675d5a1c6a4 "B" (B)
rebasing 5:539a0ff83ea9 "E" (E tip) rebasing 5:f68696fe6af8 "E" (E tip)
o 5: E o 5: E
|\ |\
| o 4: B | o 4: B
| |\ | |\
| | o 3: Z | | o 3: Z
| | | | | |
o | | 2: D o | | 2: D
|/ / |/ /
o / 1: C o / 1: C
/ /
o 0: A o 0: A
Multiple roots. Two children share two parents while dest has only one parent: Multiple roots. Two children share two parents while dest has only one parent:
$ rebasewithdag -b B+D -d Z <<'EOF' $ rebasewithdag -b B+D -d Z <<'EOF'
> Z B D > Z B D
> \|\|\ > \|\|\
> A C A > A C A
> EOF > EOF
rebasing 2:86d01f49c0d9 "B" (B) rebasing 2:f675d5a1c6a4 "B" (B)
rebasing 3:b7df2ca01aa8 "D" (D) rebasing 3:c2a779e13b56 "D" (D)
o 4: D o 4: D
|\ |\
+---o 3: B +---o 3: B
| |/ | |/
| o 2: Z | o 2: Z
| | | |
o | 1: C o | 1: C
/ /
o 0: A o 0: A

tests/test-strip.t

> with repo.lock(): > with repo.lock():
> with repo.transaction('delayedstrip'): > with repo.transaction('delayedstrip'):
> repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J') > repair.delayedstrip(ui, repo, getnodes('B+I+Z+D+E'), 'J')
> repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I') > repair.delayedstrip(ui, repo, getnodes('G+H+Z'), 'I')
> commands.commit(ui, repo, message='J', date='0 0') > commands.commit(ui, repo, message='J', date='0 0')
> EOF > EOF
$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/delayedstrip.py $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/delayedstrip.py
warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22 warning: orphaned descendants detected, not stripping 08ebfeb61bac, 112478962961, 7fb047a69f22
saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-81fa23b0-I.hg (glob) saved backup bundle to $TESTTMP/delayedstrip/.hg/strip-backup/f585351a92f8-17475721-I.hg (glob)
$ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc}' -r 'sort(all(), topo)'
@ 6:2f2d51af6205 J @ 6:2f2d51af6205 J
| |
o 3:08ebfeb61bac I o 3:08ebfeb61bac I
| |
| o 5:64a8289d2492 F | o 5:64a8289d2492 F
| | | |
> EOF > EOF
$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py
warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60 warning: orphaned descendants detected, not stripping 112478962961, 1fc8102cda62, 26805aba1e60
saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob) saved backup bundle to $TESTTMP/scmutilcleanup/.hg/strip-backup/f585351a92f8-73fb7c03-replace.hg (glob)
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
o 8:1473d4b996d1 G2 b-F@divergent3 b-G o 8:1473d4b996d1 G2 b-F@divergent3 b-G
| |
| o 7:d94e89b773b6 F2 b-F | o 7:d11b3456a873 F2 b-F
| | | |
| o 5:7fe5bac4c918 H | o 5:5cb05ba470a7 H
|/| |/|
| o 3:7fb047a69f22 E b-F@divergent1 | o 3:7fb047a69f22 E b-F@divergent1
| | | |
| | o 6:7c78f703e465 D2 b-D | | o 6:7c78f703e465 D2 b-D
| | | | | |
| | o 4:26805aba1e60 C | | o 4:26805aba1e60 C
| | | | | |
| | o 2:112478962961 B | | o 2:112478962961 B
| |/ | |/
o | 1:1fc8102cda62 G o | 1:1fc8102cda62 G
/ /
o 0:426bada5c675 A b-B b-C b-I o 0:426bada5c675 A b-B b-C b-I
$ hg bookmark $ hg bookmark
b-B 0:426bada5c675 b-B 0:426bada5c675
b-C 0:426bada5c675 b-C 0:426bada5c675
b-D 6:7c78f703e465 b-D 6:7c78f703e465
b-F 7:d94e89b773b6 b-F 7:d11b3456a873
b-F@divergent1 3:7fb047a69f22 b-F@divergent1 3:7fb047a69f22
b-F@divergent3 8:1473d4b996d1 b-F@divergent3 8:1473d4b996d1
b-G 8:1473d4b996d1 b-G 8:1473d4b996d1
b-I 0:426bada5c675 b-I 0:426bada5c675
b-Z -1:000000000000 b-Z -1:000000000000
Test the above using obsstore "by the way". Not directly related to strip, but Test the above using obsstore "by the way". Not directly related to strip, but
we have reusable code here we have reusable code here
$ cd $TESTTMP/scmutilcleanup.obsstore $ cd $TESTTMP/scmutilcleanup.obsstore
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [experimental] > [experimental]
> evolution=all > evolution=all
> evolution.track-operation=1 > evolution.track-operation=1
> EOF > EOF
$ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py $ hg log -r . -T '\n' --config extensions.t=$TESTTMP/scmutilcleanup.py
$ rm .hg/localtags $ rm .hg/localtags
$ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)' $ hg log -G -T '{rev}:{node|short} {desc} {bookmarks}' -r 'sort(all(), topo)'
o 12:1473d4b996d1 G2 b-F@divergent3 b-G o 12:1473d4b996d1 G2 b-F@divergent3 b-G
| |
| o 11:d94e89b773b6 F2 b-F | o 11:d11b3456a873 F2 b-F
| | | |
| o 8:7fe5bac4c918 H | o 8:5cb05ba470a7 H
|/| |/|
| o 4:7fb047a69f22 E b-F@divergent1 | o 4:7fb047a69f22 E b-F@divergent1
| | | |
| | o 10:7c78f703e465 D2 b-D | | o 10:7c78f703e465 D2 b-D
| | | | | |
| | x 6:26805aba1e60 C | | x 6:26805aba1e60 C
| | | | | |
| | x 3:112478962961 B | | x 3:112478962961 B
| |/ | |/
x | 1:1fc8102cda62 G x | 1:1fc8102cda62 G
/ /
o 0:426bada5c675 A b-B b-C b-I o 0:426bada5c675 A b-B b-C b-I
$ hg debugobsolete $ hg debugobsolete
1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 1fc8102cda6204549f031015641606ccf5513ec3 1473d4b996d1d1b121de6b39fab6a04fbf9d873e 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
64a8289d249234b9886244d379f15e6b650b28e3 d94e89b773b67e72642a931159ada8d1a9246998 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 64a8289d249234b9886244d379f15e6b650b28e3 d11b3456a873daec7c7bc53e5622e8df6d741bd2 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} f585351a92f85104bff7c284233c338b10eb1df7 7c78f703e465d73102cc8780667ce269c5208a40 0 (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 48b9aae0607f43ff110d84e6883c151942add5ab 0 {0000000000000000000000000000000000000000} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 112478962961147124edd43549aedd1a335e44bf 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 08ebfeb61bac6e3f12079de774d285a0d6689eba 0 {426bada5c67598ca65036d57d9e4b64b0c1ce7a0} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}
26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'} 26805aba1e600a82e93661149f2313866a221a7b 0 {112478962961147124edd43549aedd1a335e44bf} (Thu Jan 01 00:00:00 1970 +0000) {'operation': 'replace', 'user': 'test'}