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 Augie Fackler <augie@google.com>
Mon, 30 Jul 2018 14:05:56 -0400
changeset 38917 5111d11b8719
child 39667 0b7594ada0db
permissions -rw-r--r--
absorb: import extension from Facebook's hg-experimental absorb is a wicked-fast command to use blame information to automatically amend edits to the correct draft revision. Originally written by Jun Wu, this import is hgext3rd/absorb/__init__.py with: * the `testedwith` value changed * the linelog import updated * some missing configitems registered * some imports reordered per check-code.py * some missing __future__ imports added per check-code.py Differential Revision: https://phab.mercurial-scm.org/D3991
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=












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




     6


  > drawdag=$RUNTESTDIR/drawdag.py












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












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    25


  $ hg absorb












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    26


  saved backup bundle to * (glob)












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    27


  2 of 2 chunk(s) applied












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    28














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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    29


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












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    30


  @  E












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    31


  |












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    32


  o  D












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    33


  |












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    34


  o  C












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    35


  |












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    36


  o  B












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    37


  |












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    38


  | o  F












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    39


  | |












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    40


  | o  C












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    41


  | |












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    42


  | o  B












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    43


  |/












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    44


  o  A












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



Augie Fackler <augie@google.com>


parents: 

diff
changeset




    45


  














mercurial