Mercurial Mercurial > mercurial / 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-absorb-strip.t
author Pierre-Yves David <pierre-yves.david@octobus.net>
Thu, 07 Mar 2024 04:15:23 +0100
changeset 51536 718f28ea3af4
parent 41812 c91321e86071
permissions -rw-r--r--
branchcache: add a "pure topological head" fast path In a narrow but actually quick common case, all topological heads are all on the same branch and all open. In this case, computing the branch map is very simple. We can quickly detect situation where this situation will not change. So we update the V3 format to be able to express this situation and upgrade the update code to detect we remains in that mode. The branch cache is populated with the actual value when the branch map is accessed, but the update_disk method can do the update without needing to populate it.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
38917
5111d11b8719 absorb: import extension from Facebook's hg-experimental
Augie Fackler <augie@google.com>
parents:
diff changeset 
     1
 
Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits
5111d11b8719 absorb: import extension from Facebook's hg-experimental
Augie Fackler <augie@google.com>
parents:
diff changeset 
     2
 












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     3


  $ cat >> $HGRCPATH << EOF












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     4


  > [extensions]












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     5


  > absorb=







39667






0b7594ada0db
tests: fix a couple of drawdag.py references



Augie Fackler <augie@google.com>


parents: 
38917

diff
changeset




     6


  > drawdag=$TESTDIR/drawdag.py







38917






5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     7


  > EOF












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     8














5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     9


  $ hg init












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    10


  $ hg debugdrawdag << EOF












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    11


  > E












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    12


  > |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    13


  > D F












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    14


  > |/












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    15


  > C












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    16


  > |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    17


  > B












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    18


  > |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    19


  > A












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    20


  > EOF












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    21














5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    22


  $ hg up E -q












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    23


  $ echo 1 >> B












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    24


  $ echo 2 >> D







40190






31dfa7dac4c9
absorb: prompt user to accept absorb changes by default



Mark Thomas <mbthomas@fb.com>


parents: 
39667

diff
changeset




    25


  $ hg absorb -a







41812






c91321e86071
absorb: use scmutil.cleanupnodes() also when obsmarkers are disabled



Martin von Zweigbergk <martinvonz@google.com>


parents: 
40190

diff
changeset




    26


  warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60







38917






5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    27


  saved backup bundle to * (glob)












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    28


  2 of 2 chunk(s) applied












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    29














5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    30


  $ hg log -G -T '{desc}'












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    31


  @  E












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    32


  |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    33


  o  D












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    34


  |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    35


  o  C












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    36


  |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    37


  o  B












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    38


  |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    39


  | o  F












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    40


  | |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    41


  | o  C












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    42


  | |












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    43


  | o  B












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    44


  |/












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    45


  o  A












5111d11b8719
absorb: import extension from Facebook's hg-experimental



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    46


  














mercurial