upstream/mercurial-mirror Files · tests/test-absorb-strip.t

rhg: add resolve_file_args to path_utils.rs...

rhg: add resolve_file_args to path_utils.rs Extracted logic for resolving `FILE ...` arguments from cat.rs into a new function in path_utils.rs. I plan to use this for rhg annotate. I tried to reuse hg::utils::files::canonical_path instead, but that didn't work. For example it reports a InsideDotHg error for any path containing "..".

Martin von Zweigbergk - - Load All Authors

File last commit:

r41978:c91321e8 default


                r53438:f33f37ac

default

Download file

             test-absorb-strip.t
        
                    46 lines
            
             | 662 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-absorb-strip.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
absorb: import extension from Facebook's hg-experimental...

              r38953
            
      Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits

        $ cat >> $HGRCPATH << EOF

        > [extensions]

        > absorb=

        Augie Fackler
    
tests: fix a couple of drawdag.py references...

              r39703
            
        > drawdag=$TESTDIR/drawdag.py

        Augie Fackler
    
absorb: import extension from Facebook's hg-experimental...

              r38953
            
        > EOF

        $ hg init

        $ hg debugdrawdag << EOF

        > E

        > |

        > D F

        > |/

        > C

        > |

        > B

        > |

        > A

        > EOF

        $ hg up E -q

        $ echo 1 >> B

        $ echo 2 >> D

        Mark Thomas
    
absorb: prompt user to accept absorb changes by default...

              r40226
            
        $ hg absorb -a

        Martin von Zweigbergk
    
absorb: use scmutil.cleanupnodes() also when obsmarkers are disabled...

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

        Augie Fackler
    
absorb: import extension from Facebook's hg-experimental...

              r38953
            
        saved backup bundle to * (glob)

        2 of 2 chunk(s) applied

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

        @  E

        |

        o  D

        |

        o  C

        |

        o  B

        |

        | o  F

        | |

        | o  C

        | |

        | o  B

        |/

        o  A

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

Augie Fackler absorb: import extension from Facebook's hg-experimental...	r38953	Do not strip innocent children. See https://bitbucket.org/facebook/hg-experimental/issues/6/hg-absorb-merges-diverged-commits

		$ cat >> $HGRCPATH << EOF
		> [extensions]
		> absorb=
Augie Fackler tests: fix a couple of drawdag.py references...	r39703	> drawdag=$TESTDIR/drawdag.py
Augie Fackler absorb: import extension from Facebook's hg-experimental...	r38953	> EOF

		$ hg init
		$ hg debugdrawdag << EOF
		> E
		> \|
		> D F
		> \|/
		> C
		> \|
		> B
		> \|
		> A
		> EOF

		$ hg up E -q
		$ echo 1 >> B
		$ echo 2 >> D
Mark Thomas absorb: prompt user to accept absorb changes by default...	r40226	$ hg absorb -a
Martin von Zweigbergk absorb: use scmutil.cleanupnodes() also when obsmarkers are disabled...	r41978	warning: orphaned descendants detected, not stripping 112478962961, 26805aba1e60
Augie Fackler absorb: import extension from Facebook's hg-experimental...	r38953	saved backup bundle to * (glob)
		2 of 2 chunk(s) applied

		$ hg log -G -T '{desc}'
		@ E
		\|
		o D
		\|
		o C
		\|
		o B
		\|
		\| o F
		\| \|
		\| o C
		\| \|
		\| o B
		\|/
		o A