Mercurial Mercurial > hg / 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 Siddharth Agarwal <sid0@fb.com>
Fri, 29 Mar 2013 19:54:06 -0700
changeset 18851 a60963c02f92
parent 18081 f88c60e740a1
child 39473 b6db2e80a9ce
permissions -rw-r--r--
pull: list bookmarks before pulling changesets (issue3873) Consider a bookmark B that exists both locally and remotely. If B is updated remotely, and then a pull is performed where the pull set contains the new location of B, the bookmark is updated locally. However, if remote B is updated in the middle of a pull to a location not in the pull set, the bookmark won't be updated locally at all. To fix this, list bookmarks before pulling in changesets, not after. This still leaves a race open if B gets moved in between listing bookmarks and pulling in changesets, but the race window is much smaller. Fixing the race properly would require a bundle format upgrade. test-hook.t's output changes because we no longer do two listkeys calls during pull, just one. test-pull-http.t's output changes because we now search for bookmarks before searching for changes.
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
c7cc40fd74f6 Add ancestors and descendants to revlog
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff changeset 
     4
 
3 4 2 1 0
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
f88c60e740a1 revlog.ancestors: add support for including revs
Siddharth Agarwal <sid0@fb.com>
parents: 16868
diff changeset 
    10
 
7 6 5 3 4 2 1 0
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
f88c60e740a1 revlog.ancestors: add support for including revs
Siddharth Agarwal <sid0@fb.com>
parents: 16868
diff changeset 
    12
 
7 5 3 6 4 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















Mercurial