Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-revlog-ancestry.py.out
author Martin von Zweigbergk <martinvonz@google.com>
Fri, 27 Aug 2021 13:51:44 -0700
branchstable
changeset 47871 86a60679cf61
parent 39491 a60dae060bc8
permissions -rw-r--r--
fix: again allow formatting the working copy while merging I forgot about unfinished merges (I think I was thinking only about unfinished merge conflicts) when I wrote https://phab.mercurial-scm.org/D11209. As a coworker (hg contributor dploch) reported to me, this led to `hg fix --working-dir` failing when you have an uncommitted merge. The fix is trivial: just move the assertion to just before the call to `scmutil.movedirstate()` where it actually matters. Differential Revision: https://phab.mercurial-scm.org/D11376
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6872
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     1
 
Ancestors of 5
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     2
 
4 2 0
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     3
 
Ancestors of 6 and 5
39490
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents: 18081
diff changeset 
     4
 
4 3 2 1 0
6872
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     5
 
Ancestors of 5 and 4
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     6
 
4 2 0
16868
eb88ed4269c5 revlog: add optional stoprev arg to revlog.ancestors()
Joshua Redstone <joshua.redstone@fb.com>
parents: 6872
diff changeset 
     7
 
Ancestors of 7, stop at 6
eb88ed4269c5 revlog: add optional stoprev arg to revlog.ancestors()
Joshua Redstone <joshua.redstone@fb.com>
parents: 6872
diff changeset 
     8
 
6
18081
f88c60e740a1 revlog.ancestors: add support for including revs
Siddharth Agarwal <sid0@fb.com>
parents: 16868
diff changeset 
     9
 
Ancestors of 7, including revs
39490
b6db2e80a9ce ancestors: actually iterate over ancestors in topological order (issue5979)
Boris Feld <boris.feld@octobus.net>
parents: 18081
diff changeset 
    10
 
7 6 5 4 3 2 1 0
18081
f88c60e740a1 revlog.ancestors: add support for including revs
Siddharth Agarwal <sid0@fb.com>
parents: 16868
diff changeset 
    11
 
Ancestors of 7, 5 and 3, including revs
39491
a60dae060bc8 ancestors: ensure a consistent order even in the "inclusive" case
Boris Feld <boris.feld@octobus.net>
parents: 39490
diff changeset 
    12
 
7 6 5 4 3 2 1 0
6872
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
    13
 












c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    14


Descendants of 5













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    15


7 8 













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    16


Descendants of 5 and 3













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    17


6 7 8 













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    18


Descendants of 5 and 4













c7cc40fd74f6
Add ancestors and descendants to revlog



Stefano Tortarolo <stefano.tortarolo@gmail.com>


parents: 

diff
changeset




    19


5 7 8















hg-stable