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 Mark Thomas <mbthomas@fb.com>
Fri, 12 Oct 2018 17:48:40 +0000
changeset 40190 31dfa7dac4c9
parent 39667 0b7594ada0db
child 41812 c91321e86071
permissions -rw-r--r--
absorb: prompt user to accept absorb changes by default Change the default absorb behaviour to print the changes out and then prompt the user if they want to absorb the changes or not. Providing the `-p` option still prints the result and exits. A new `-a` option is provided which applies the changes without printing them, giving the equivalent of the old behaviour. Differential Revision: https://phab.mercurial-scm.org/D4999
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







38917






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