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

obsolete: reports the number of local changeset obsoleted when unbundling...

obsolete: reports the number of local changeset obsoleted when unbundling This is a first basic visible usage of the changes tracking in the transaction. We adds a new function computing the pre-existing changesets obsoleted by a transaction and a transaction call back displaying this information. Example output: added 1 changesets with 1 changes to 1 files (+1 heads) 3 new obsolescence markers obsoleted 1 changesets The goal is to evolve the transaction summary into something bigger, gathering existing output there and adding new useful one. This patch is a good first step on this road. The new output is basic but give a user to the content of tr.changes['obsmarkers'] and give an idea of the new options we haves. I expect to revisit the message soon. The caller recording the transaction summary should also be moved into a more generic location but further refactoring is needed before it can happen.

marmoute - - Load All Authors

File last commit:

r33249:53b3a196 default


                r33249:53b3a196

default

Download file

             test-obsolete-bundle-strip.t
        
                    1372 lines
            
             | 87.3 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-obsolete-bundle-strip.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        marmoute
    
test: add a test file for relevant obsmarkers and its usage...

              r32487
            
      ==================================================

      Test obsmarkers interaction with bundle and strip

      ==================================================

      Setup a repository with various case

      ====================================

      Config setup

      ------------

        $ cat >> $HGRCPATH <<EOF

        > [ui]

        > # simpler log output

        > logtemplate = "{node|short}: {desc}\n"

        > 

        > [experimental]

        > # enable evolution

        > evolution = all

        > 

        > # include obsmarkers in bundle

        > evolution.bundle-obsmarker = yes

        > 

        > [extensions]

        > # needed for some tests

        > strip =

        > [defaults]

        > # we'll query many hidden changeset

        > debugobsolete = --hidden

        > EOF

        $ mkcommit() {

        >    echo "$1" > "$1"

        >    hg add "$1"

        >    hg ci -m "$1"

        > }

        $ getid() {

        >    hg log --hidden --template '{node}\n' --rev "$1"

        > }

        $ mktestrepo () {

        >     [ -n "$1" ] || exit 1

        >     cd $TESTTMP

        >     hg init $1

        >     cd $1

        >     mkcommit ROOT

        > }

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
      Function to compare the expected bundled obsmarkers with the actually bundled

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
      obsmarkers. It also check the obsmarkers backed up during strip.

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        $ testrevs () {

        >     revs="$1"

        >     testname=`basename \`pwd\``

        Yuya Nishihara
    
test-obsolete-bundle-strip: do not include \n in filename (issue5586)

              r32685
            
        >     revsname=`hg --hidden log -T '-{desc}' --rev "${revs}"`

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        >     prefix="${TESTTMP}/${testname}${revsname}"

        >     markersfile="${prefix}-relevant-markers.txt"

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        >     exclufile="${prefix}-exclusive-markers.txt"

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        >     bundlefile="${prefix}-bundle.hg"

        >     contentfile="${prefix}-bundle-markers.hg"

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        >     stripcontentfile="${prefix}-bundle-markers.hg"

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        >     hg debugobsolete --hidden --rev "${revs}" | sed 's/^/    /' > "${markersfile}"

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        >     hg debugobsolete --hidden --rev "${revs}" --exclusive | sed 's/^/    /' > "${exclufile}"

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        >     echo '### Matched revisions###'

        >     hg log --hidden --rev "${revs}" | sort

        >     echo '### Relevant markers ###'

        >     cat "${markersfile}"

        >     printf "# bundling: "

        >     hg bundle --hidden --base "parents(roots(${revs}))" --rev "${revs}" "${bundlefile}"

        Danek Duvall
    
debugbundle: add --part-type flag to emit only named part types...

              r32694
            
        >     hg debugbundle --part-type obsmarkers "${bundlefile}" | sed 1,3d > "${contentfile}"

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        >     echo '### Bundled markers ###'

        >     cat "${contentfile}"

        >     echo '### diff <relevant> <bundled> ###'

        >     cmp "${markersfile}" "${contentfile}" || diff -u "${markersfile}" "${contentfile}"

        >     echo '#################################'

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        >     echo '### Exclusive markers ###'

        >     cat "${exclufile}"

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        >     # if the matched revs do not have children, we also check the result of strip

        Martin von Zweigbergk
    
tests: simplify and clarify test-obsolete-bundle-strip.t a little

              r32681
            
        >     children=`hg log --hidden --rev "((${revs})::) - (${revs})"`

        >     if [ -z "$children" ];

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        >     then

        >         printf "# stripping: "

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        >         prestripfile="${prefix}-pre-strip.txt"

        >         poststripfile="${prefix}-post-strip.txt"

        >         strippedfile="${prefix}-stripped-markers.txt"

        >         hg debugobsolete --hidden | sort | sed 's/^/    /' > "${prestripfile}"

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        >         hg strip --hidden --rev "${revs}"

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        >         hg debugobsolete --hidden | sort | sed 's/^/    /' > "${poststripfile}"

        Danek Duvall
    
debugbundle: add --part-type flag to emit only named part types...

              r32694
            
        >         hg debugbundle --part-type obsmarkers .hg/strip-backup/* | sed 1,3d > "${stripcontentfile}"

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        >         echo '### Backup markers ###'

        >         cat "${stripcontentfile}"

        >         echo '### diff <relevant> <backed-up> ###'

        >         cmp "${markersfile}" "${stripcontentfile}" || diff -u "${markersfile}" "${stripcontentfile}"

        >         echo '#################################'

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        >         cat "${prestripfile}" "${poststripfile}" | sort | uniq -u > "${strippedfile}"

        >         echo '### Stripped markers ###'

        >         cat "${strippedfile}"

        >         echo '### diff <exclusive> <stripped> ###'

        >         cmp "${exclufile}" "${strippedfile}" || diff -u "${exclufile}" "${strippedfile}"

        >         echo '#################################'

        >         # restore and clean up repo for the next test

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        >         hg unbundle .hg/strip-backup/* | sed 's/^/# unbundling: /'

        >         # clean up directory for the next test

        >         rm .hg/strip-backup/*

        >     fi

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        > }

        marmoute
    
test: add a test file for relevant obsmarkers and its usage...

              r32487
            
      root setup

      -------------

      simple chain

      ============

      .    A0

      .   ⇠ø⇠◔ A1

      .    |/

      .    ●

      setup

      -----

        $ mktestrepo simple-chain

        $ mkcommit 'C-A0'

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit 'C-A1'

        created new head

        $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`

        $ hg debugobsolete `getid 'desc("C-A0")'` a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1

        $ hg debugobsolete a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 `getid 'desc("C-A1")'`

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ hg log --hidden -G

        o  cf2c22470d67: C-A1

        |

        | x  84fcb0dfe17b: C-A0

        |/

        @  ea207398892e: ROOT

        $ hg debugobsolete

        a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

      Actual testing

      --------------

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        $ testrevs 'desc("C-A0")'

        ### Matched revisions###

        84fcb0dfe17b: C-A0

        ### Relevant markers ###

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        $ testrevs 'desc("C-A1")'

        ### Matched revisions###

        cf2c22470d67: C-A1

        ### Relevant markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 2 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        # unbundling: obsoleted 1 changesets

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the first case...

              r32592
            
        $ testrevs 'desc("C-A")'

        ### Matched revisions###

        84fcb0dfe17b: C-A0

        cf2c22470d67: C-A1

        ### Relevant markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/simple-chain/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1a1 cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 3 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
obsolete: fix relevant-obsmarkers computation on pruned changeset...

              r32488
            
      chain with prune children

      =========================

      .  ⇠⊗ B0

      .   |

      .  ⇠ø⇠◔ A1

      .     |

      .     ●

      setup

      -----

        $ mktestrepo prune

        $ mkcommit 'C-A0'

        $ mkcommit 'C-B0'

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ mkcommit 'C-A1'

        created new head

        $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`

        $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`

        $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ hg log --hidden -G

        o  cf2c22470d67: C-A1

        |

        | x  29f93b1df87b: C-B0

        | |

        | x  84fcb0dfe17b: C-A0

        |/

        @  ea207398892e: ROOT

        $ hg debugobsolete

        a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

      Actual testing

      --------------

        marmoute
    
test-obsolete-bundle-strip: test bundling in the second case...

              r32593
            
        $ testrevs 'desc("C-A0")'

        ### Matched revisions###

        84fcb0dfe17b: C-A0

        ### Relevant markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

      (The strip markers is considered exclusive to the pruned changeset even if it

      is also considered "relevant" to its parent. This allows to strip prune

      markers. This avoid leaving prune markers from dead-end that could be

      problematic)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the second case...

              r32593
            
        $ testrevs 'desc("C-B0")'

        ### Matched revisions###

        29f93b1df87b: C-B0

        ### Relevant markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/29f93b1df87b-7fb32101-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 1 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg update' to get a working copy)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the second case...

              r32593
            
        $ testrevs 'desc("C-A1")'

        ### Matched revisions###

        cf2c22470d67: C-A1

        ### Relevant markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 1 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        # unbundling: obsoleted 1 changesets

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the second case...

              r32593
            
      bundling multiple revisions

        $ testrevs 'desc("C-A")'

        ### Matched revisions###

        84fcb0dfe17b: C-A0

        cf2c22470d67: C-A1

        ### Relevant markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        marmoute
    
test-obsolete-bundle-strip: test bundling in the second case...

              r32593
            
        $ testrevs 'desc("C-")'

        ### Matched revisions###

        29f93b1df87b: C-B0

        84fcb0dfe17b: C-A0

        cf2c22470d67: C-A1

        ### Relevant markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 3 changesets found

        ### Bundled markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/prune/.hg/strip-backup/cf2c22470d67-884c33b0-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 3 changesets with 3 changes to 3 files (+1 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 3 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
obsolete: fix relevant-obsmarkers computation on pruned changeset...

              r32488
            
      chain with precursors also pruned

      =================================

      .   A0 (also pruned)

      .  ⇠ø⇠◔ A1

      .     |

      .     ●

      setup

      -----

        $ mktestrepo prune-inline

        $ mkcommit 'C-A0'

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit 'C-A1'

        created new head

        $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`

        $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`

        $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ hg log --hidden -G

        o  cf2c22470d67: C-A1

        |

        | x  84fcb0dfe17b: C-A0

        |/

        @  ea207398892e: ROOT

        $ hg debugobsolete

        a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

      Actual testing

      --------------

        marmoute
    
test-obsolete-bundle-strip: test bundling in the third case...

              r32594
            
        $ testrevs 'desc("C-A0")'

        ### Matched revisions###

        84fcb0dfe17b: C-A0

        ### Relevant markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/84fcb0dfe17b-6454bbdc-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the third case...

              r32594
            
        $ testrevs 'desc("C-A1")'

        ### Matched revisions###

        cf2c22470d67: C-A1

        ### Relevant markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 1 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the third case...

              r32594
            
        $ testrevs 'desc("C-A")'

        ### Matched revisions###

        84fcb0dfe17b: C-A0

        cf2c22470d67: C-A1

        ### Relevant markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/prune-inline/.hg/strip-backup/cf2c22470d67-fce4fc64-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 2 changesets with 2 changes to 2 files (+1 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 3 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: add cases with prune on missing revs...

              r32489
            
      chain with missing prune

      ========================

      .   ⊗ B

      .   |

      .  ⇠◌⇠◔ A1

      .   |

      .   ●

      setup

      -----

        $ mktestrepo missing-prune

        $ mkcommit 'C-A0'

        $ mkcommit 'C-B0'

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ mkcommit 'C-A1'

        created new head

        $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`

        $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`

        $ hg debugobsolete --record-parents `getid 'desc("C-B0")'`

      (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no

        marmoute
    
test-obsolete-bundle-strip: add cases with prune on missing revs...

              r32489
            
        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ hg log --hidden -G

        o  cf2c22470d67: C-A1

        |

        @  ea207398892e: ROOT

        $ hg debugobsolete

        a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

      Actual testing

      --------------

        marmoute
    
test-obsolete-bundle-strip: test bundling in the fourth case...

              r32595
            
        $ testrevs 'desc("C-A1")'

        ### Matched revisions###

        cf2c22470d67: C-A1

        ### Relevant markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/missing-prune/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            29f93b1df87baee1824e014080d8adf145f81783 0 {84fcb0dfe17b256ebae52e05572993b9194c018a} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 3 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg update' to get a working copy)

        marmoute
    
test-obsolete-bundle-strip: add cases with prune on missing revs...

              r32489
            
      chain with precursors also pruned

      =================================

      .   A0 (also pruned)

      .  ⇠◌⇠◔ A1

      .     |

      .     ●

      setup

      -----

        $ mktestrepo prune-inline-missing

        $ mkcommit 'C-A0'

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit 'C-A1'

        created new head

        $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A0")'`

        $ hg debugobsolete --record-parents `getid 'desc("C-A0")'`

        $ hg debugobsolete `getid 'desc("C-A0")'` `getid 'desc("C-A1")'`

      (it is annoying to create prune with parent data without the changeset, so we strip it after the fact)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        $ hg strip --hidden --rev 'desc("C-A0")::' --no-backup --config devel.strip-obsmarkers=no

        marmoute
    
test-obsolete-bundle-strip: add cases with prune on missing revs...

              r32489
            
        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ hg log --hidden -G

        o  cf2c22470d67: C-A1

        |

        @  ea207398892e: ROOT

        $ hg debugobsolete

        a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

      Actual testing

      --------------

        marmoute
    
test-obsolete-bundle-strip: test bundling in the fifth case...

              r32596
            
        $ testrevs 'desc("C-A1")'

        ### Matched revisions###

        cf2c22470d67: C-A1

        ### Relevant markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/prune-inline-missing/.hg/strip-backup/cf2c22470d67-fa0f07b0-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            84fcb0dfe17b256ebae52e05572993b9194c018a 0 {ea207398892eb49e06441f10dda2a731f0450f20} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            84fcb0dfe17b256ebae52e05572993b9194c018a cf2c22470d67233004e934a31184ac2b35389914 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 84fcb0dfe17b256ebae52e05572993b9194c018a 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 3 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg update' to get a working copy)

        marmoute
    
test-obsolete-bundle-strip: add a complex split and fold case...

              r32490
            
      Chain with fold and split

      =========================

      setup

      -----

        $ mktestrepo split-fold

        $ mkcommit 'C-A'

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit 'C-B'

        created new head

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit 'C-C'

        created new head

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit 'C-D'

        created new head

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkcommit 'C-E'

        created new head

        $ hg debugobsolete a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 `getid 'desc("C-A")'`

        $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-B")'` `getid 'desc("C-C")'` # record split

        $ hg debugobsolete `getid 'desc("C-A")'` `getid 'desc("C-D")'` # other divergent

        $ hg debugobsolete `getid 'desc("C-A")'` b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0

        $ hg debugobsolete b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 `getid 'desc("C-E")'`

        $ hg debugobsolete `getid 'desc("C-B")'` `getid 'desc("C-E")'`

        $ hg debugobsolete `getid 'desc("C-C")'` `getid 'desc("C-E")'`

        $ hg debugobsolete `getid 'desc("C-D")'` `getid 'desc("C-E")'`

        $ hg debugobsolete c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 `getid 'desc("C-E")'`

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ hg log --hidden -G

        o  2f20ff6509f0: C-E

        |

        | x  06dc9da25ef0: C-D

        |/

        | x  27ec657ca21d: C-C

        |/

        | x  a9b9da38ed96: C-B

        |/

        | x  9ac430e15fca: C-A

        |/

        @  ea207398892e: ROOT

        $ hg debugobsolete

        a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

      Actual testing

      --------------

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
        $ testrevs 'desc("C-A")'

        ### Matched revisions###

        9ac430e15fca: C-A

        ### Relevant markers ###

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-81204eba-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
        $ testrevs 'desc("C-B")'

        ### Matched revisions###

        a9b9da38ed96: C-B

        ### Relevant markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-7465d6e9-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
        $ testrevs 'desc("C-C")'

        ### Matched revisions###

        27ec657ca21d: C-C

        ### Relevant markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/27ec657ca21d-d5dd1c7c-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
        $ testrevs 'desc("C-D")'

        ### Matched revisions###

        06dc9da25ef0: C-D

        ### Relevant markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/06dc9da25ef0-9b1c0a91-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
        $ testrevs 'desc("C-E")'

        ### Matched revisions###

        2f20ff6509f0: C-E

        ### Relevant markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-8adeb22d-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files (+1 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 6 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        # unbundling: obsoleted 3 changesets

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
      Bundle multiple revisions

      * each part of the split

        $ testrevs 'desc("C-B") + desc("C-C")'

        ### Matched revisions###

        27ec657ca21d: C-C

        a9b9da38ed96: C-B

        ### Relevant markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-0daf625a-backup.hg (glob)

        Martin von Zweigbergk
    
tests: add missing parens in test-obsolete-bundle-strip.t...

              r32680
            
        ### Backup markers ###

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        ### Stripped markers ###

        ### diff <exclusive> <stripped> ###

        #################################

        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads)

        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
      * top one and other divergent

        $ testrevs 'desc("C-E") + desc("C-D")'

        ### Matched revisions###

        06dc9da25ef0: C-D

        2f20ff6509f0: C-E

        ### Relevant markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-bf1b80f4-backup.hg (glob)

        Martin von Zweigbergk
    
tests: add missing parens in test-obsolete-bundle-strip.t...

              r32680
            
        ### Backup markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        ### Stripped markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads)

        # unbundling: 7 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        # unbundling: obsoleted 2 changesets

        Martin von Zweigbergk
    
tests: add missing parens in test-obsolete-bundle-strip.t...

              r32680
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
      * top one and initial precursors

        $ testrevs 'desc("C-E") + desc("C-A")'

        ### Matched revisions###

        2f20ff6509f0: C-E

        9ac430e15fca: C-A

        ### Relevant markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/9ac430e15fca-36b6476a-backup.hg (glob)

        Martin von Zweigbergk
    
tests: add missing parens in test-obsolete-bundle-strip.t...

              r32680
            
        ### Backup markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        ### Stripped markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads)

        # unbundling: 6 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        # unbundling: obsoleted 3 changesets

        Martin von Zweigbergk
    
tests: add missing parens in test-obsolete-bundle-strip.t...

              r32680
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
      * top one and one of the split

        $ testrevs 'desc("C-E") + desc("C-C")'

        ### Matched revisions###

        27ec657ca21d: C-C

        2f20ff6509f0: C-E

        ### Relevant markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/2f20ff6509f0-5fdfcd7d-backup.hg (glob)

        Martin von Zweigbergk
    
tests: add missing parens in test-obsolete-bundle-strip.t...

              r32680
            
        ### Backup markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        ### Stripped markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 2 changesets with 2 changes to 2 files (+2 heads)

        # unbundling: 7 new obsolescence markers

        marmoute
    
obsolete: reports the number of local changeset obsoleted when unbundling...

              r33249
            
        # unbundling: obsoleted 2 changesets

        Martin von Zweigbergk
    
tests: add missing parens in test-obsolete-bundle-strip.t...

              r32680
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test-obsolete-bundle-strip: test bundling in the sixth case...

              r32597
            
      * all

        $ testrevs 'desc("C-")'

        ### Matched revisions###

        06dc9da25ef0: C-D

        27ec657ca21d: C-C

        2f20ff6509f0: C-E

        9ac430e15fca: C-A

        a9b9da38ed96: C-B

        ### Relevant markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 5 changesets found

        ### Bundled markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/split-fold/.hg/strip-backup/a9b9da38ed96-eeb4258f-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            27ec657ca21dd27c36c99fa75586f72ff0d442f1 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 06dc9da25ef03e1ff7864dded5fcba42eff2a3f0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c a9b9da38ed96f8c6c14f429441f625a344eb4696 27ec657ca21dd27c36c99fa75586f72ff0d442f1 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            9ac430e15fca923b0ba027ca85d4d75c5c9cb73c b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0a0 9ac430e15fca923b0ba027ca85d4d75c5c9cb73c 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            a9b9da38ed96f8c6c14f429441f625a344eb4696 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0b0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

            c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0c0 2f20ff6509f0e013e90c5c8efd996131c918b0ca 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 5 changesets with 5 changes to 5 files (+4 heads)

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 9 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg heads' to see heads)

        marmoute
    
test: add isolated prune case (to test-obsolete-bundle-strip.t)...

              r32491
            
      changeset pruned on its own

      ===========================

      . ⊗ B

      . |

      . ◕ A

      . |

      . ●

      setup

      -----

        $ mktestrepo lonely-prune

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ mkcommit 'C-A'

        $ mkcommit 'C-B'

        $ hg debugobsolete --record-parent `getid 'desc("C-B")'`

        $ hg up 'desc("ROOT")'

        0 files updated, 0 files merged, 2 files removed, 0 files unresolved

        $ hg log --hidden -G

        x  cefb651fc2fd: C-B

        |

        o  9ac430e15fca: C-A

        |

        @  ea207398892e: ROOT

        $ hg debugobsolete

        cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

      Actual testing

      --------------

        marmoute
    
test-obsolete-bundle-strip: test bundling in the seventh case...

              r32598
            
        $ testrevs 'desc("C-A")'

        ### Matched revisions###

        9ac430e15fca: C-A

        ### Relevant markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

        marmoute
    
test-obsolete-bundle-strip: test bundling in the seventh case...

              r32598
            
        $ testrevs 'desc("C-B")'

        ### Matched revisions###

        cefb651fc2fd: C-B

        ### Relevant markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 1 changesets found

        ### Bundled markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/cefb651fc2fd-345c8dfa-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        ### Backup markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 1 changesets with 1 changes to 1 files

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 1 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: add testing of markers backup during strip...

              r32624
            
        # unbundling: (run 'hg update' to get a working copy)

        marmoute
    
test-obsolete-bundle-strip: check all changesets in the isolated prune case...

              r32625
            
        $ testrevs 'desc("C-")'

        ### Matched revisions###

        9ac430e15fca: C-A

        cefb651fc2fd: C-B

        ### Relevant markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        # bundling: 2 changesets found

        ### Bundled markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <bundled> ###

        #################################

        marmoute
    
exclusive-markers: update the dedicated test with list of exclusive markers...

              r32627
            
        ### Exclusive markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        Matt Harbison
    
test-obsolete-bundle-strip: add globs for Windows

              r32693
            
        # stripping: saved backup bundle to $TESTTMP/lonely-prune/.hg/strip-backup/9ac430e15fca-b9855b02-backup.hg (glob)

        marmoute
    
test-obsolete-bundle-strip: check all changesets in the isolated prune case...

              r32625
            
        ### Backup markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <relevant> <backed-up> ###

        #################################

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        ### Stripped markers ###

            cefb651fc2fdc7bb75e588781de5e432c134e8a5 0 {9ac430e15fca923b0ba027ca85d4d75c5c9cb73c} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}

        ### diff <exclusive> <stripped> ###

        #################################

        marmoute
    
test-obsolete-bundle-strip: check all changesets in the isolated prune case...

              r32625
            
        # unbundling: adding changesets

        # unbundling: adding manifests

        # unbundling: adding file changes

        # unbundling: added 2 changesets with 2 changes to 2 files

        marmoute
    
strip: strip obsmarkers exclusive to the stripped changeset...

              r32629
            
        # unbundling: 1 new obsolescence markers

        marmoute
    
test-obsolete-bundle-strip: check all changesets in the isolated prune case...

              r32625
            
        # unbundling: (run 'hg update' to get a working copy)

	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